Daniel Berlin wrote:
> Madan U Sreenivasan wrote:
>> Hi,
>>
>> I beleive that the current merge of merge properties is has to be
>> improved. Am working on that. I want to sound my ideas here for your
>> suggestions.
>>
>> for example:
>>
>> @r12:
>> svn:mergeinfo on /branches/branch1: /trunk: 3-5,6
>>
>> Step 1:
>> cp /branches/branch1 /branches/branch2
>> @r13
>> svn:mergeinfo on /branches/branch2: /trunk: 3-5,6
>>
>> Step 2:
>> merge /trunk -r 9-13 (into /branches/branch1)
>> @r14
>> svn:mergeinfo on /branches/branch1: /trunk: 3-5, 6, 10-13
>>
>> Step 3:
>> merge /branches/branch1 -r13:14 (into /branches/branch2)
>> @r15
>> svn:mergeinfo on /branches/branch2: /trunk: 3-5,6
>> /branches/branch1:
>> 14
>>
>> I expect it to be:
>> @r15
>> svn:mergeinfo on /branches/branch2: /trunk: 3-5, 6, 10-13
>> /branches/branch1:
>> 14
> This is what it should be, and what the design specifies.
> Anything else is just a bug :)
So just to be clear, I mean that if it doesn't produce what you have
listed under "I expect it to be", then that is a bug, as that is what it
should produce.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 7 14:01:23 2006