Re: Three-way merge markers by default

Daniel Shahaf <d.s_at_daniel.shahaf.name> writes:

> --- subversion/libsvn_wc/merge.c 2011-08-06 19:15:44.000000000 +0400
> +++ subversion/libsvn_wc/merge.c 2011-09-07 21:47:19.000000000 +0400
> @@ -413,7 +413,7 @@
> target_marker,
> right_marker,
> "=======", /* separator */
> - svn_diff_conflict_display_modified_latest,
> + svn_diff_conflict_display_modified_original_latest,
> pool));
> SVN_ERR(svn_stream_close(ostream));
>

Somebody asked me about this exact change at one of our Subversion Live
events, as I recall they were rebuilding Subversion to get this
feature. I did look at making it configureable but I wasn't sure
whether configuration at such a low level was desirable. It's also
a tedious API change to get the configuration passed all the way down,
although we might be able to use (abuse?) the merge_options hash.

svn_diff_conflict_display_modified_latest is similar to the output of
GNU diff3 which is probably why it was chosen. Changing it might cause
problems for tools that parse the output, but one option for anyone
affected would be to use GNU diff3 with --diff3-cmd. We will also need
to fix our testsuite to expect the new output.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*