Searched refs:tree_conflict_local_node_kind (Results 1 – 1 of 1) sorted by relevance
1182 svn_node_kind_t tree_conflict_local_node_kind; member1236 svn_node_kind_t tree_conflict_local_node_kind; member1674 db->tree_conflict_local_node_kind, in mark_dir_edited()1753 fb->tree_conflict_local_node_kind, in mark_file_edited()1847 fb->tree_conflict_local_node_kind = svn_node_none; in merge_file_opened()1850 if (fb->tree_conflict_local_node_kind == svn_node_none) in merge_file_opened()1884 else if (fb->tree_conflict_local_node_kind != svn_node_file) in merge_file_opened()1990 else if (fb->tree_conflict_local_node_kind != svn_node_none in merge_file_opened()2657 db->tree_conflict_local_node_kind = svn_node_none; in merge_dir_opened()2660 if (db->tree_conflict_local_node_kind == svn_node_none) in merge_dir_opened()[all …]