Re: Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict

Philip Martin <philip@codematters.co.uk> writes:

> Erik Huelsmann <ehuels@gmail.com> writes:
>
>>> Subversion makes two runs to libsvn_wc/merge.c's svn_wc_merge() during
>>> the update. During the first, dry_run is 1, during the
>>> second, it is 0. My problem is that during the dry run
>>> Subversion uses its internal diff3 (which is producing the
>>> merGe'd state) and during the second phase it's using the
>>> external diff3 utility which is telling me this is a Conflict.
>
> Yup, that's a bug.
>
> --- subversion/libsvn_wc/update_editor.c (revision 16751)
> +++ subversion/libsvn_wc/update_editor.c (working copy)
> @@ -2203,7 +2203,7 @@
> svn_path_join (base, base_name, pool),
> adm_access,
> oldrev_str, newrev_str, ".mine",
> - TRUE, &merge_outcome, NULL,
> + TRUE, &merge_outcome, diff3_cmd,
> pool));
>
> } /* end: working file exists and has mods */

I'm not going to apply this patch, as it reverts r10889 which "fixed"
issue 1914. The problem is that it causes the external diff3 to be
run twice, which is not really acceptable if diff3 is a graphical
diff3 that relies on user interaction. I'm going to reopen 1914.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org