Home
last modified time | relevance | path

Searched refs:complete_conflict (Results 1 – 2 of 2) sorted by relevance

/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDupdate_editor.c820 complete_conflict(svn_skel_t *conflict, in complete_conflict() function
908 SVN_ERR(complete_conflict(db->edit_conflict, db->edit_baton, in mark_directory_edited()
944 SVN_ERR(complete_conflict(fb->edit_conflict, fb->edit_baton, in mark_file_edited()
1262 SVN_ERR(complete_conflict(tree_conflict, eb, in open_root()
1765 SVN_ERR(complete_conflict(tree_conflict, eb, local_abspath, repos_relpath, in delete_entry()
2158 SVN_ERR(complete_conflict(tree_conflict, eb, db->local_abspath, in add_directory()
2751 SVN_ERR(complete_conflict(conflict_skel, in close_directory()
2986 SVN_ERR(complete_conflict(tree_conflict, eb, local_abspath, in absent_node()
3361 SVN_ERR(complete_conflict(tree_conflict, in add_file()
3780 SVN_ERR(complete_conflict(fb->edit_conflict, fb->edit_baton, in change_file_prop()
[all …]
HDconflicts.c665 svn_boolean_t complete_conflict; in svn_wc__conflict_skel_resolve() local
666 SVN_ERR(svn_wc__conflict_skel_is_complete(&complete_conflict, in svn_wc__conflict_skel_resolve()
669 *completely_resolved = !complete_conflict; in svn_wc__conflict_skel_resolve()