Home
last modified time | relevance | path

Searched refs:svn_wc_notify_state_conflicted (Results 1 – 11 of 11) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svnbench/
Dnotify.c194 if (n->content_state == svn_wc_notify_state_conflicted) in notify()
210 if (n->content_state == svn_wc_notify_state_conflicted) in notify()
219 if (n->prop_state == svn_wc_notify_state_conflicted) in notify()
286 if (n->content_state == svn_wc_notify_state_conflicted) in notify()
300 if (n->prop_state == svn_wc_notify_state_conflicted) in notify()
494 if (n->content_state == svn_wc_notify_state_conflicted) in notify()
508 if (n->prop_state == svn_wc_notify_state_conflicted) in notify()
/freebsd-10-stable/contrib/subversion/subversion/svn/
Dnotify.c321 if (n->content_state == svn_wc_notify_state_conflicted) in notify_body()
334 if (n->content_state == svn_wc_notify_state_conflicted) in notify_body()
342 if (n->prop_state == svn_wc_notify_state_conflicted) in notify_body()
400 if (n->content_state == svn_wc_notify_state_conflicted) in notify_body()
413 if (n->prop_state == svn_wc_notify_state_conflicted) in notify_body()
599 if (n->content_state == svn_wc_notify_state_conflicted) in notify_body()
612 if (n->prop_state == svn_wc_notify_state_conflicted) in notify_body()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dmerge.c2101 if (property_state == svn_wc_notify_state_conflicted) in merge_file_changed()
2166 || property_state == svn_wc_notify_state_conflicted) in merge_file_changed()
2173 text_state = svn_wc_notify_state_conflicted; in merge_file_changed()
2185 if (text_state == svn_wc_notify_state_conflicted in merge_file_changed()
2188 || property_state == svn_wc_notify_state_conflicted in merge_file_changed()
3028 if (prop_state == svn_wc_notify_state_conflicted) in merge_dir_changed()
3034 if (prop_state == svn_wc_notify_state_conflicted in merge_dir_changed()
3181 if (prop_state == svn_wc_notify_state_conflicted) in merge_dir_added()
3643 (notify->content_state == svn_wc_notify_state_conflicted \
3646 || notify->prop_state == svn_wc_notify_state_conflicted \
Dpatch.c2135 notify->content_state = svn_wc_notify_state_conflicted; in send_patch_notification()
2142 notify->prop_state = svn_wc_notify_state_conflicted; in send_patch_notification()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dprops.c843 svn_wc_notify_state_conflicted }; in set_prop_merge_state()
1316 set_prop_merge_state(state, svn_wc_notify_state_conflicted); in svn_wc__merge_props()
Dmerge.c1418 if (*merge_props_outcome == svn_wc_notify_state_conflicted in svn_wc_merge5()
Dwc_db_update_move.c1000 if (prop_state == svn_wc_notify_state_conflicted) in tc_editor_alter_directory()
1158 content_state = svn_wc_notify_state_conflicted; in tc_editor_alter_file()
Dconflicts.c2951 || notify->prop_state == svn_wc_notify_state_conflicted in tree_conflict_collector()
2952 || notify->content_state == svn_wc_notify_state_conflicted)) in tree_conflict_collector()
Dexternals.c881 content_state = svn_wc_notify_state_conflicted; in close_file()
Dupdate_editor.c4163 *content_state = svn_wc_notify_state_conflicted; in merge_file()
4606 if (content_state != svn_wc_notify_state_conflicted) in close_file()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_wc.h1305 svn_wc_notify_state_conflicted, enumerator