Home
last modified time | relevance | path

Searched refs:tree_conflict (Results 1 – 25 of 90) sorted by relevance

1234

/dports/java/java-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dupdate_editor.c1748 if (tree_conflict != NULL) in delete_entry()
1816 if (tree_conflict) in delete_entry()
2011 if (tree_conflict) in add_directory()
2165 if (tree_conflict) in add_directory()
2194 if (tree_conflict != NULL) in add_directory()
2341 if (tree_conflict != NULL) in open_directory()
3016 if (tree_conflict) in absent_node()
3033 if (tree_conflict) in absent_node()
3227 if (tree_conflict) in add_file()
3393 if (tree_conflict != NULL) in add_file()
[all …]
H A Dtree_conflicts.c478 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict, in svn_wc__get_tree_conflict() argument
496 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
508 *tree_conflict = svn_wc_conflict_description2_dup(desc, result_pool); in svn_wc__get_tree_conflict()
513 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
H A Dinfo.c511 const svn_wc_conflict_description2_t *tree_conflict; in svn_wc__get_info() local
542 tree_conflict = APR_ARRAY_IDX(conflicts, 0, in svn_wc__get_info()
545 if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath, in svn_wc__get_info()
546 tree_conflict->node_kind, iterpool)) in svn_wc__get_info()
H A Dconflicts.c546 svn_skel_t *tree_conflict; in svn_wc__conflict_skel_add_tree_conflict() local
549 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_skel_add_tree_conflict()
552 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ in svn_wc__conflict_skel_add_tree_conflict()
557 tree_conflict = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_add_tree_conflict()
589 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
592 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
596 svn_skel__prepend(markers, tree_conflict); in svn_wc__conflict_skel_add_tree_conflict()
958 svn_skel_t *tree_conflict; in svn_wc__conflict_read_tree_conflict() local
962 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_read_tree_conflict()
965 if (!tree_conflict) in svn_wc__conflict_read_tree_conflict()
[all …]
/dports/devel/py-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dupdate_editor.c1748 if (tree_conflict != NULL) in delete_entry()
1816 if (tree_conflict) in delete_entry()
2011 if (tree_conflict) in add_directory()
2165 if (tree_conflict) in add_directory()
2194 if (tree_conflict != NULL) in add_directory()
2341 if (tree_conflict != NULL) in open_directory()
3016 if (tree_conflict) in absent_node()
3033 if (tree_conflict) in absent_node()
3227 if (tree_conflict) in add_file()
3393 if (tree_conflict != NULL) in add_file()
[all …]
H A Dtree_conflicts.c478 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict, in svn_wc__get_tree_conflict() argument
496 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
508 *tree_conflict = svn_wc_conflict_description2_dup(desc, result_pool); in svn_wc__get_tree_conflict()
513 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
H A Dinfo.c511 const svn_wc_conflict_description2_t *tree_conflict; in svn_wc__get_info() local
542 tree_conflict = APR_ARRAY_IDX(conflicts, 0, in svn_wc__get_info()
545 if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath, in svn_wc__get_info()
546 tree_conflict->node_kind, iterpool)) in svn_wc__get_info()
H A Dconflicts.c546 svn_skel_t *tree_conflict; in svn_wc__conflict_skel_add_tree_conflict() local
549 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_skel_add_tree_conflict()
552 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ in svn_wc__conflict_skel_add_tree_conflict()
557 tree_conflict = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_add_tree_conflict()
589 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
592 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
596 svn_skel__prepend(markers, tree_conflict); in svn_wc__conflict_skel_add_tree_conflict()
958 svn_skel_t *tree_conflict; in svn_wc__conflict_read_tree_conflict() local
962 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_read_tree_conflict()
965 if (!tree_conflict) in svn_wc__conflict_read_tree_conflict()
[all …]
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/libsvn_wc/
H A Dupdate_editor.c1748 if (tree_conflict != NULL) in delete_entry()
1816 if (tree_conflict) in delete_entry()
2011 if (tree_conflict) in add_directory()
2165 if (tree_conflict) in add_directory()
2194 if (tree_conflict != NULL) in add_directory()
2341 if (tree_conflict != NULL) in open_directory()
3016 if (tree_conflict) in absent_node()
3033 if (tree_conflict) in absent_node()
3227 if (tree_conflict) in add_file()
3393 if (tree_conflict != NULL) in add_file()
[all …]
H A Dtree_conflicts.c478 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict, in svn_wc__get_tree_conflict() argument
496 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
508 *tree_conflict = svn_wc_conflict_description2_dup(desc, result_pool); in svn_wc__get_tree_conflict()
513 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
H A Dinfo.c511 const svn_wc_conflict_description2_t *tree_conflict; in svn_wc__get_info() local
542 tree_conflict = APR_ARRAY_IDX(conflicts, 0, in svn_wc__get_info()
545 if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath, in svn_wc__get_info()
546 tree_conflict->node_kind, iterpool)) in svn_wc__get_info()
H A Dconflicts.c546 svn_skel_t *tree_conflict; in svn_wc__conflict_skel_add_tree_conflict() local
549 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_skel_add_tree_conflict()
552 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ in svn_wc__conflict_skel_add_tree_conflict()
557 tree_conflict = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_add_tree_conflict()
589 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
592 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
596 svn_skel__prepend(markers, tree_conflict); in svn_wc__conflict_skel_add_tree_conflict()
958 svn_skel_t *tree_conflict; in svn_wc__conflict_read_tree_conflict() local
962 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_read_tree_conflict()
965 if (!tree_conflict) in svn_wc__conflict_read_tree_conflict()
[all …]
/dports/devel/p5-subversion/subversion-1.14.1/subversion/libsvn_wc/
H A Dupdate_editor.c1748 if (tree_conflict != NULL) in delete_entry()
1816 if (tree_conflict) in delete_entry()
2011 if (tree_conflict) in add_directory()
2165 if (tree_conflict) in add_directory()
2194 if (tree_conflict != NULL) in add_directory()
2341 if (tree_conflict != NULL) in open_directory()
3016 if (tree_conflict) in absent_node()
3033 if (tree_conflict) in absent_node()
3227 if (tree_conflict) in add_file()
3393 if (tree_conflict != NULL) in add_file()
[all …]
H A Dtree_conflicts.c478 svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict, in svn_wc__get_tree_conflict() argument
496 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
508 *tree_conflict = svn_wc_conflict_description2_dup(desc, result_pool); in svn_wc__get_tree_conflict()
513 *tree_conflict = NULL; in svn_wc__get_tree_conflict()
H A Dinfo.c511 const svn_wc_conflict_description2_t *tree_conflict; in svn_wc__get_info() local
542 tree_conflict = APR_ARRAY_IDX(conflicts, 0, in svn_wc__get_info()
545 if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath, in svn_wc__get_info()
546 tree_conflict->node_kind, iterpool)) in svn_wc__get_info()
H A Dconflicts.c546 svn_skel_t *tree_conflict; in svn_wc__conflict_skel_add_tree_conflict() local
549 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_skel_add_tree_conflict()
552 SVN_ERR_ASSERT(!tree_conflict); /* ### Use proper error? */ in svn_wc__conflict_skel_add_tree_conflict()
557 tree_conflict = svn_skel__make_empty_list(result_pool); in svn_wc__conflict_skel_add_tree_conflict()
589 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
592 tree_conflict, result_pool); in svn_wc__conflict_skel_add_tree_conflict()
596 svn_skel__prepend(markers, tree_conflict); in svn_wc__conflict_skel_add_tree_conflict()
958 svn_skel_t *tree_conflict; in svn_wc__conflict_read_tree_conflict() local
962 SVN_ERR(conflict__get_conflict(&tree_conflict, conflict_skel, in svn_wc__conflict_read_tree_conflict()
965 if (!tree_conflict) in svn_wc__conflict_read_tree_conflict()
[all …]
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DNotifyAction.java205 public static final int tree_conflict = 38; field
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DNotifyAction.java205 public static final int tree_conflict = 38; field
/dports/devel/p5-subversion/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DNotifyAction.java205 public static final int tree_conflict = 38; field
/dports/devel/py-subversion/subversion-1.14.1/subversion/bindings/javahl/src/org/tigris/subversion/javahl/
H A DNotifyAction.java205 public static final int tree_conflict = 38; field
/dports/java/java-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c285 svn_client_conflict_t *tree_conflict; in print_status() local
287 SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath, in print_status()
291 &desc, tree_conflict, pool)); in print_status()
/dports/devel/py-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c285 svn_client_conflict_t *tree_conflict; in print_status() local
287 SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath, in print_status()
291 &desc, tree_conflict, pool)); in print_status()
/dports/security/subversion-gnome-keyring/subversion-1.14.1/subversion/svn/
H A Dstatus.c285 svn_client_conflict_t *tree_conflict; in print_status() local
287 SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath, in print_status()
291 &desc, tree_conflict, pool)); in print_status()
/dports/devel/p5-subversion/subversion-1.14.1/subversion/svn/
H A Dstatus.c285 svn_client_conflict_t *tree_conflict; in print_status() local
287 SVN_ERR(svn_client_conflict_get(&tree_conflict, local_abspath, in print_status()
291 &desc, tree_conflict, pool)); in print_status()
/dports/java/java-subversion/subversion-1.14.1/subversion/bindings/swig/perl/native/t/
H A D3client.t753 is($wc_status->tree_conflict(), undef,
841 is($wc_status->tree_conflict(), undef,
929 is($wc_status->tree_conflict(), undef,

1234