Home
last modified time | relevance | path

Searched refs:svn_wc_conflict_choose_postpone (Results 1 – 6 of 6) sorted by relevance

/freebsd-10-stable/contrib/subversion/subversion/svn/
Dconflict-callbacks.c459 svn_wc_conflict_choose_postpone },
461 svn_wc_conflict_choose_postpone },
481 svn_wc_conflict_choose_postpone },
483 svn_wc_conflict_choose_postpone },
507 svn_wc_conflict_choose_postpone },
509 svn_wc_conflict_choose_postpone },
521 svn_wc_conflict_choose_postpone },
523 svn_wc_conflict_choose_postpone },
536 svn_wc_conflict_choose_postpone },
538 svn_wc_conflict_choose_postpone },
[all …]
/freebsd-10-stable/contrib/subversion/subversion/libsvn_client/
Dctx.c75 *result = svn_wc_create_conflict_result(svn_wc_conflict_choose_postpone, in call_conflict_func()
Dswitch.c75 *result = svn_wc_create_conflict_result(svn_wc_conflict_choose_postpone, in record_conflict()
Dupdate.c180 *result = svn_wc_create_conflict_result(svn_wc_conflict_choose_postpone, in record_conflict()
/freebsd-10-stable/contrib/subversion/subversion/libsvn_wc/
Dconflicts.c1323 case svn_wc_conflict_choose_postpone: in generate_propconflict()
1606 if (choice == svn_wc_conflict_choose_postpone) in build_text_conflict_resolve_items()
1679 case svn_wc_conflict_choose_postpone: in build_text_conflict_resolve_items()
1685 SVN_ERR_ASSERT(choice == svn_wc_conflict_choose_postpone); in build_text_conflict_resolve_items()
2002 if (result->choice != svn_wc_conflict_choose_postpone) in svn_wc__conflict_invoke_resolver()
2040 if (result->choice != svn_wc_conflict_choose_postpone) in svn_wc__conflict_invoke_resolver()
3030 if (my_choice == svn_wc_conflict_choose_postpone) in conflict_status_walker()
/freebsd-10-stable/contrib/subversion/subversion/include/
Dsvn_wc.h2142 svn_wc_conflict_choose_postpone = 0, enumerator