Home
last modified time | relevance | path

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

/freebsd-11-stable/contrib/subversion/subversion/svn/
HDconflict-callbacks.c105 const char *their_abspath; in show_diff() local
108 &their_abspath, in show_diff()
131 path1 = their_abspath; in show_diff()
141 path1 = their_abspath; in show_diff()
184 const char *their_abspath; in show_conflicts() local
187 &base_abspath, &their_abspath, in show_conflicts()
192 SVN_ERR(svn_diff_file_diff3_2(&diff, base_abspath, my_abspath, their_abspath, in show_conflicts()
197 output, diff, base_abspath, my_abspath, their_abspath, in show_conflicts()
900 const char *their_abspath; in handle_text_conflict() local
908 &base_abspath, &their_abspath, in handle_text_conflict()
[all …]
HDcl-conflicts.c516 const char *their_abspath; in svn_cl__append_conflict_info_xml() local
542 &their_abspath, in svn_cl__append_conflict_info_xml()
555 &str, scratch_pool, "cur-base-file", their_abspath); in svn_cl__append_conflict_info_xml()
HDinfo-cmd.c908 const char *their_abspath = NULL; in print_info() local
911 NULL, &my_abspath, &base_abspath, &their_abspath, in print_info()
930 if (their_abspath) in print_info()
935 their_abspath, in print_info()
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
HDutil.c296 if (conflict->their_abspath) in svn_wc_conflict_description2_dup()
297 new_conflict->their_abspath = apr_pstrdup(pool, conflict->their_abspath); in svn_wc_conflict_description2_dup()
312 new_conflict->prop_reject_abspath = new_conflict->their_abspath; in svn_wc_conflict_description2_dup()
397 if (conflict->their_abspath) in svn_wc__cd2_to_cd()
399 conflict->their_abspath); in svn_wc__cd2_to_cd()
HDquestions.c399 const char *their_abspath; in internal_conflicted_p() local
411 &their_abspath, in internal_conflicted_p()
425 if (!done && their_abspath) in internal_conflicted_p()
427 SVN_ERR(svn_io_check_path(their_abspath, &kind, scratch_pool)); in internal_conflicted_p()
445 if (!done && (mine_abspath || their_abspath || their_old_abspath)) in internal_conflicted_p()
HDconflicts.h155 const char *their_abspath,
332 const char **their_abspath,
HDconflicts.c350 const char *their_abspath, in svn_wc__conflict_skel_add_text_conflict() argument
369 if (their_abspath) in svn_wc__conflict_skel_add_text_conflict()
374 db, wri_abspath, their_abspath, in svn_wc__conflict_skel_add_text_conflict()
788 const char **their_abspath, in svn_wc__conflict_read_text_conflict() argument
838 if (their_abspath) in svn_wc__conflict_read_text_conflict()
845 SVN_ERR(svn_wc__db_from_relpath(their_abspath, in svn_wc__conflict_read_text_conflict()
850 *their_abspath = NULL; in svn_wc__conflict_read_text_conflict()
1325 cdesc->their_abspath = cdesc->prop_reject_abspath; in generate_propconflict()
1616 const char *their_abspath; in build_text_conflict_resolve_items() local
1628 &their_abspath, in build_text_conflict_resolve_items()
[all …]
HDentries.c955 const char *their_abspath; in read_one_entry() local
958 &their_abspath, in read_one_entry()
970 if (their_abspath) in read_one_entry()
971 entry->conflict_new = svn_dirent_basename(their_abspath, in read_one_entry()
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
HDdeprecated.c2860 info->conflict_wrk = conflict->their_abspath; in info_from_info2()
2864 info->prejfile = conflict->their_abspath; in info_from_info2()
HDconflicts.c13137 return get_conflict_desc2_t(conflict)->their_abspath; in svn_client_conflict_prop_get_reject_abspath()
13176 *incoming_new_abspath = get_conflict_desc2_t(conflict)->their_abspath; in svn_client_conflict_text_get_contents()
/freebsd-11-stable/contrib/subversion/subversion/include/
HDsvn_wc.h1872 const char *their_abspath; member