Daniel Rall wrote:
> On Thu, 21 Sep 2006, Kamesh Jayachandran wrote:
>
>
>>> Kamesh, thanks for the test fix -- I've committed to the branch as
>>> r21577 with some tweaks. While correct handling of merge info for the
>>> 3-way merge really doesn't work yet, this is an incremental step in
>>> the right direction (documented in the TODO file). It's great than
>>> you were able to make forward progress and fix a test at the same
>>> time!
>>>
>> Should we change our 'svn:mergeinfo' format a bit take care of '3 way
>> merges'?
>> Like 'pathname:revlist'|pathname1@rev1-pathname2@rev2'?
>>
>
> I don't understand this.
>
>
Like every other merge just record the 'svn:mergeinfo' with the value of
the form 'path1@rev1-path2@rev2' for 3 way merges so that future such
merges might start from rev1+ and rev2+ for those corresponding paths.
This would be consistent with our way of maintaining the mergeinfo.(Of
course it needs a tweak to 'sqlite database schema'.)
With regards
Kamesh Jayachandran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Sep 22 12:07:37 2006