Home
last modified time | relevance | path

Searched refs:svn_diff_t (Results 1 – 17 of 17) sorted by relevance

/freebsd-11-stable/contrib/subversion/subversion/include/
HDsvn_diff.h82 typedef struct svn_diff_t svn_diff_t; typedef
189 svn_diff_diff_2(svn_diff_t **diff,
201 svn_diff_diff(svn_diff_t **diff,
214 svn_diff_diff3_2(svn_diff_t **diff,
226 svn_diff_diff3(svn_diff_t **diff,
240 svn_diff_diff4_2(svn_diff_t **diff,
252 svn_diff_diff4(svn_diff_t **diff,
264 svn_diff_contains_conflicts(svn_diff_t *diff);
271 svn_diff_contains_diffs(svn_diff_t *diff);
376 svn_diff_t *resolved_diff);
[all …]
/freebsd-11-stable/contrib/subversion/subversion/libsvn_diff/
HDdeprecated.c149 svn_diff_t *diff, in svn_diff_file_output_unified3()
176 svn_diff_t *diff, in svn_diff_file_output_unified2()
192 svn_diff_t *diff, in svn_diff_file_output_unified()
206 svn_diff_file_diff(svn_diff_t **diff, in svn_diff_file_diff()
216 svn_diff_file_diff3(svn_diff_t **diff, in svn_diff_file_diff3()
227 svn_diff_file_diff4(svn_diff_t **diff, in svn_diff_file_diff4()
240 svn_diff_t *diff, in svn_diff_file_output_merge()
276 svn_diff_t *diff, in svn_diff_file_output_merge2()
302 svn_diff_diff(svn_diff_t **diff, in svn_diff_diff()
317 svn_diff_diff3(svn_diff_t **diff, in svn_diff_diff3()
[all …]
HDdiff4.c111 adjust_diff(svn_diff_t *diff, svn_diff_t *adjust) in adjust_diff()
113 svn_diff_t *hunk; in adjust_diff()
169 svn_diff_diff4_2(svn_diff_t **diff, in svn_diff_diff4_2()
184 svn_diff_t *diff_ol; in svn_diff_diff4_2()
185 svn_diff_t *diff_adjust; in svn_diff_diff4_2()
186 svn_diff_t *hunk; in svn_diff_diff4_2()
HDdiff.h50 struct svn_diff_t { struct
51 svn_diff_t *next; argument
59 svn_diff_t *resolved_diff; argument
155 svn_diff_t *
162 svn_diff__resolve_conflict(svn_diff_t *hunk,
HDdiff.c65 svn_diff_t *
71 svn_diff_t *diff; in svn_diff__diff()
72 svn_diff_t **diff_ref = &diff; in svn_diff__diff()
129 svn_diff_diff_2(svn_diff_t **diff, in svn_diff_diff_2()
HDutil.c48 svn_diff_contains_conflicts(svn_diff_t *diff) in svn_diff_contains_conflicts()
64 svn_diff_contains_diffs(svn_diff_t *diff) in svn_diff_contains_diffs()
80 svn_diff_output2(svn_diff_t *diff, in svn_diff_output2()
587 svn_diff_t *diff; in svn_diff__display_prop_diffs()
HDdiff_memory.c282 svn_diff_mem_string_diff(svn_diff_t **diff, in svn_diff_mem_string_diff()
300 svn_diff_mem_string_diff3(svn_diff_t **diff, in svn_diff_mem_string_diff3()
321 svn_diff_mem_string_diff4(svn_diff_t **diff, in svn_diff_mem_string_diff4()
614 svn_diff_t *diff, in svn_diff_mem_string_output_unified3()
882 svn_diff_t *diff);
898 svn_diff_t *diff) in output_conflict()
972 svn_diff_t *diff) in output_conflict_with_context()
1052 svn_diff_t *diff, in svn_diff_mem_string_output_merge3()
HDdiff3.c39 svn_diff__resolve_conflict(svn_diff_t *hunk, in svn_diff__resolve_conflict()
55 svn_diff_t **diff_ref = &hunk->resolved_diff; in svn_diff__resolve_conflict()
251 svn_diff_diff3_2(svn_diff_t **diff, in svn_diff_diff3_2()
327 svn_diff_t **diff_ref = diff; in svn_diff_diff3_2()
HDdiff_file.c1316 svn_diff_file_diff_2(svn_diff_t **diff, in svn_diff_file_diff_2()
1336 svn_diff_file_diff3_2(svn_diff_t **diff, in svn_diff_file_diff3_2()
1358 svn_diff_file_diff4_2(svn_diff_t **diff, in svn_diff_file_diff4_2()
1850 svn_diff_t *diff, in svn_diff_file_output_unified4()
2237 svn_diff_t *diff);
2316 svn_diff_t *diff) in output_conflict()
2378 svn_diff_t *diff, in svn_diff_file_output_merge3()
/freebsd-11-stable/contrib/subversion/subversion/svn/
HDfile-merge.c826 svn_diff_t *resolved_diff) in file_merge_output_conflict()
873 svn_diff_t *diff; in svn_cl__merge_file()
HDconflict-callbacks.c101 svn_diff_t *diff; in show_diff()
179 svn_diff_t *diff; in show_conflicts()
227 svn_diff_t *diff; in merge_prop_conflict()
/freebsd-11-stable/contrib/subversion/subversion/libsvn_client/
HDblame.c305 svn_diff_t *diff; in add_file_blame()
HDdiff.c1079 svn_diff_t *diff; in diff_content_changed()
/freebsd-11-stable/contrib/subversion/subversion/libsvn_wc/
HDmerge.c399 svn_diff_t *diff; in do_text_merge()
HDconflicts.c1306 svn_diff_t *diff; in generate_propconflict()
1466 svn_diff_t *diff; in merge_showing_conflicts()
HDprops.c524 svn_diff_t *diff; in prop_conflict_new()
/freebsd-11-stable/contrib/subversion/subversion/svnlook/
HDsvnlook.c1068 svn_diff_t *diff; in print_diff_tree()