Searched refs:new_tree_conflicts (Results 1 – 1 of 1) sorted by relevance
1207 apr_hash_t *new_tree_conflicts; member1425 if (! parent_baton->new_tree_conflicts) in record_tree_conflict()1426 parent_baton->new_tree_conflicts = apr_hash_make(result_pool); in record_tree_conflict()1428 svn_hash_sets(parent_baton->new_tree_conflicts, in record_tree_conflict()1940 && pdb->new_tree_conflicts in merge_file_opened()1941 && (old_tc = svn_hash_gets(pdb->new_tree_conflicts, local_abspath))) in merge_file_opened()2770 && pdb->new_tree_conflicts in merge_dir_opened()2771 && (old_tc = svn_hash_gets(pdb->new_tree_conflicts, local_abspath))) in merge_dir_opened()