Searched refs:conflict_base_val (Results 1 – 4 of 4) sorted by relevance
| /dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | conflicts.c | 1253 const svn_string_t *conflict_base_val = base_val ? base_val in generate_propconflict() local
1258 conflict_base_val->data, in generate_propconflict()
1259 conflict_base_val->len, in generate_propconflict()
1266 const svn_string_t *conflict_base_val; in generate_propconflict() local
1286 conflict_base_val = incoming_old_val; in generate_propconflict()
1288 conflict_base_val = base_val; in generate_propconflict()
1292 conflict_base_val = base_val; in generate_propconflict()
1295 SVN_ERR(svn_io_write_unique(&file_name, dirpath, conflict_base_val->data, in generate_propconflict()
1296 conflict_base_val->len, in generate_propconflict()
1313 SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val, in generate_propconflict()
[all …]
|
| /dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | conflicts.c | 1253 const svn_string_t *conflict_base_val = base_val ? base_val in generate_propconflict() local
1258 conflict_base_val->data, in generate_propconflict()
1259 conflict_base_val->len, in generate_propconflict()
1266 const svn_string_t *conflict_base_val; in generate_propconflict() local
1286 conflict_base_val = incoming_old_val; in generate_propconflict()
1288 conflict_base_val = base_val; in generate_propconflict()
1292 conflict_base_val = base_val; in generate_propconflict()
1295 SVN_ERR(svn_io_write_unique(&file_name, dirpath, conflict_base_val->data, in generate_propconflict()
1296 conflict_base_val->len, in generate_propconflict()
1313 SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val, in generate_propconflict()
[all …]
|
| /dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | conflicts.c | 1253 const svn_string_t *conflict_base_val = base_val ? base_val in generate_propconflict() local
1258 conflict_base_val->data, in generate_propconflict()
1259 conflict_base_val->len, in generate_propconflict()
1266 const svn_string_t *conflict_base_val; in generate_propconflict() local
1286 conflict_base_val = incoming_old_val; in generate_propconflict()
1288 conflict_base_val = base_val; in generate_propconflict()
1292 conflict_base_val = base_val; in generate_propconflict()
1295 SVN_ERR(svn_io_write_unique(&file_name, dirpath, conflict_base_val->data, in generate_propconflict()
1296 conflict_base_val->len, in generate_propconflict()
1313 SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val, in generate_propconflict()
[all …]
|
| /dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/ |
| H A D | conflicts.c | 1253 const svn_string_t *conflict_base_val = base_val ? base_val in generate_propconflict() local
1258 conflict_base_val->data, in generate_propconflict()
1259 conflict_base_val->len, in generate_propconflict()
1266 const svn_string_t *conflict_base_val; in generate_propconflict() local
1286 conflict_base_val = incoming_old_val; in generate_propconflict()
1288 conflict_base_val = base_val; in generate_propconflict()
1292 conflict_base_val = base_val; in generate_propconflict()
1295 SVN_ERR(svn_io_write_unique(&file_name, dirpath, conflict_base_val->data, in generate_propconflict()
1296 conflict_base_val->len, in generate_propconflict()
1313 SVN_ERR(svn_diff_mem_string_diff3(&diff, conflict_base_val, in generate_propconflict()
[all …]
|