[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Three-way merge markers by default

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 02 May 2014 16:38:18 +0100

Philip Martin <philip.martin_at_wandisco.com> writes:

> Philip Martin <philip.martin_at_wandisco.com> writes:
>
>> An error in my testsuite change. This passes all the tests with the
>> 3-way output:
>>
>> Index: subversion/libsvn_wc/merge.c
>> ===================================================================
>> --- subversion/libsvn_wc/merge.c (revision 1591407)
>> +++ subversion/libsvn_wc/merge.c (working copy)
>> @@ -422,7 +422,7 @@ do_text_merge(svn_boolean_t *contains_conflicts,
>> 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));
>>
>
> Need to fix the Ruby tests as well:
>
> Index: swig/ruby/test/test_client.rb
> ===================================================================
> --- swig/ruby/test/test_client.rb (revision 1591407)
> +++ swig/ruby/test/test_client.rb (working copy)
> @@ -2498,7 +2498,7 @@ class SvnClientTest < Test::Unit::TestCase
> assert_not_nil(info)
> assert_equal(3, info.revision)
>
> - assert_equal("<<<<<<< .mine\nafter\n=======\nbefore\n>>>>>>> .r2\n",
> + assert_equal("<<<<<<< .mine\nafter\n||||||| .r1\n=======\nbefore\n>>>>>>> .r2\n",
> File.read(path))
> end
> end

So this works and I've enhanced tools/diff/diff3 so that it can be used
as an external diff. I like this change so I have committed it. If
anyone objects I am open to reverting it.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*
Received on 2014-05-02 17:38:54 CEST

This is an archived mail posted to the Subversion Dev mailing list.