Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_reason_moved_away (Results 1 – 9 of 9) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svn/
Dcl-conflicts.c56 { "moved-away", svn_wc_conflict_reason_moved_away },
98 case svn_wc_conflict_reason_moved_away: in local_reason_str()
124 case svn_wc_conflict_reason_moved_away: in local_reason_str()
151 case svn_wc_conflict_reason_moved_away: in local_reason_str()
Dconflict-callbacks.c1158 if (desc->reason == svn_wc_conflict_reason_moved_away) in handle_tree_conflict()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dtree_conflicts.c83 { "moved-away", svn_wc_conflict_reason_moved_away },
416 (conflict->reason != svn_wc_conflict_reason_moved_away && in svn_wc__add_tree_conflict()
Dconflicts.c520 { "moved-away", svn_wc_conflict_reason_moved_away },
552 SVN_ERR_ASSERT(reason == svn_wc_conflict_reason_moved_away in svn_wc__conflict_skel_add_tree_conflict()
557 if (reason == svn_wc_conflict_reason_moved_away in svn_wc__conflict_skel_add_tree_conflict()
967 is_moved_away = (value == svn_wc_conflict_reason_moved_away); in svn_wc__conflict_read_tree_conflict()
1816 || reason == svn_wc_conflict_reason_moved_away)) in read_tree_conflict_desc()
2728 if (reason != svn_wc_conflict_reason_moved_away) in resolve_tree_conflict_on_node()
2747 if (reason == svn_wc_conflict_reason_moved_away in resolve_tree_conflict_on_node()
2804 else if (reason == svn_wc_conflict_reason_moved_away in resolve_tree_conflict_on_node()
Dwc_db_update_move.c423 || (reason == svn_wc_conflict_reason_moved_away in create_tree_conflict()
578 ? svn_wc_conflict_reason_moved_away in mark_tc_on_op_root()
1958 svn_wc_conflict_reason_moved_away, in bump_mark_tree_conflict()
2324 if (reason == svn_wc_conflict_reason_moved_away) in fetch_conflict_details()
2405 svn_wc_conflict_reason_moved_away, in svn_wc__db_op_raise_moved_away_internal()
Dquestions.c483 if (reason == svn_wc_conflict_reason_moved_away in internal_conflicted_p()
Dupdate_editor.c1253 svn_wc_conflict_reason_moved_away, in open_root()
1405 reason = svn_wc_conflict_reason_moved_away; in check_tree_conflict()
1497 || reason == svn_wc_conflict_reason_moved_away in check_tree_conflict()
2344 || reason == svn_wc_conflict_reason_moved_away in open_directory()
3536 || reason == svn_wc_conflict_reason_moved_away in open_file()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_wc.h1624 svn_wc_conflict_reason_moved_away, enumerator
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dmerge.c1365 reason = svn_wc_conflict_reason_moved_away; in record_tree_conflict()
1967 || old_tc->reason == svn_wc_conflict_reason_moved_away) in merge_file_opened()
2791 || old_tc->reason == svn_wc_conflict_reason_moved_away) in merge_dir_opened()