Lines Matching refs:tree_conflict
1251 svn_skel_t *tree_conflict = svn_wc__conflict_skel_create(pool); in open_root() local
1254 tree_conflict, eb->db, move_src_root_abspath, in open_root()
1265 SVN_ERR(complete_conflict(tree_conflict, eb, in open_root()
1274 tree_conflict, in open_root()
1280 db->edit_conflict = tree_conflict; in open_root()
1620 svn_skel_t *tree_conflict = NULL; in delete_entry() local
1741 SVN_ERR(check_tree_conflict(&tree_conflict, eb, local_abspath, in delete_entry()
1748 if (tree_conflict != NULL) in delete_entry()
1758 tree_conflict); in delete_entry()
1770 SVN_ERR(complete_conflict(tree_conflict, eb, local_abspath, repos_relpath, in delete_entry()
1787 (tree_conflict != NULL), in delete_entry()
1790 tree_conflict, NULL, in delete_entry()
1797 (tree_conflict != NULL), in delete_entry()
1800 tree_conflict, NULL, in delete_entry()
1816 if (tree_conflict) in delete_entry()
1821 tree_conflict, in delete_entry()
1865 svn_skel_t *tree_conflict = NULL; in add_directory() local
2009 tree_conflict = svn_hash_gets(pb->deletion_conflicts, db->name); in add_directory()
2011 if (tree_conflict) in add_directory()
2024 tree_conflict, in add_directory()
2027 tree_conflict = svn_wc__conflict_skel_create(db->pool); in add_directory()
2030 tree_conflict, in add_directory()
2039 db->edit_conflict = tree_conflict; /* Cache for close_directory */ in add_directory()
2040 tree_conflict = NULL; /* No direct notification */ in add_directory()
2128 SVN_ERR(check_tree_conflict(&tree_conflict, eb, in add_directory()
2135 if (tree_conflict == NULL) in add_directory()
2153 tree_conflict = svn_wc__conflict_skel_create(db->pool); in add_directory()
2156 tree_conflict, in add_directory()
2161 db->edit_conflict = tree_conflict; in add_directory()
2165 if (tree_conflict) in add_directory()
2166 SVN_ERR(complete_conflict(tree_conflict, eb, db->local_abspath, in add_directory()
2186 tree_conflict, NULL, in add_directory()
2194 if (tree_conflict != NULL) in add_directory()
2196 db->edit_conflict = tree_conflict; in add_directory()
2244 svn_skel_t *tree_conflict = NULL; in open_directory() local
2335 SVN_ERR(check_tree_conflict(&tree_conflict, eb, db->local_abspath, in open_directory()
2341 if (tree_conflict != NULL) in open_directory()
2344 db->edit_conflict = tree_conflict; in open_directory()
2349 tree_conflict, in open_directory()
2889 svn_skel_t *tree_conflict = NULL; in absent_node() local
3005 SVN_ERR(check_tree_conflict(&tree_conflict, eb, local_abspath, in absent_node()
3016 if (tree_conflict) in absent_node()
3017 SVN_ERR(complete_conflict(tree_conflict, eb, local_abspath, in absent_node()
3030 tree_conflict, NULL, in absent_node()
3033 if (tree_conflict) in absent_node()
3038 tree_conflict, in absent_node()
3095 svn_skel_t *tree_conflict = NULL; in add_file() local
3225 tree_conflict = svn_hash_gets(pb->deletion_conflicts, fb->name); in add_file()
3227 if (tree_conflict) in add_file()
3240 tree_conflict, in add_file()
3243 tree_conflict = svn_wc__conflict_skel_create(fb->pool); in add_file()
3246 tree_conflict, in add_file()
3255 fb->edit_conflict = tree_conflict; /* Cache for close_file */ in add_file()
3256 tree_conflict = NULL; /* No direct notification */ in add_file()
3344 SVN_ERR(check_tree_conflict(&tree_conflict, eb, in add_file()
3351 if (tree_conflict == NULL) in add_file()
3370 tree_conflict = svn_wc__conflict_skel_create(fb->pool); in add_file()
3373 tree_conflict, in add_file()
3393 if (tree_conflict != NULL) in add_file()
3395 SVN_ERR(complete_conflict(tree_conflict, in add_file()
3410 tree_conflict, NULL, in add_file()
3413 fb->edit_conflict = tree_conflict; in add_file()
3442 svn_skel_t *tree_conflict = NULL; in open_file() local
3530 SVN_ERR(check_tree_conflict(&tree_conflict, eb, fb->local_abspath, in open_file()
3536 if (tree_conflict != NULL) in open_file()
3539 fb->edit_conflict = tree_conflict; in open_file()
3544 tree_conflict, in open_file()