Searched refs:incoming_new_val (Results 1 – 1 of 1) sorted by relevance
| /freebsd-13-stable/contrib/subversion/subversion/libsvn_wc/ |
| HD | conflicts.c | 1188 const svn_string_t *incoming_new_val, in generate_propconflict() argument
1222 if (incoming_new_val) in generate_propconflict()
1226 SVN_ERR(svn_io_write_unique(&file_name, dirpath, incoming_new_val->data, in generate_propconflict()
1227 incoming_new_val->len, in generate_propconflict()
1234 cdesc->prop_value_incoming_new = incoming_new_val; in generate_propconflict()
1303 if (working_val && incoming_new_val) in generate_propconflict()
1315 incoming_new_val, options, scratch_pool)); in generate_propconflict()
1318 incoming_new_val, NULL, NULL, NULL, NULL, in generate_propconflict()
1329 if (!incoming_old_val && incoming_new_val) in generate_propconflict()
1331 else if (incoming_old_val && !incoming_new_val) in generate_propconflict()
[all …]
|