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

Re: [merge-tracking]: Release date/version

From: Folker Schamel <schamel23_at_spinor.com>
Date: 2007-03-08 09:07:16 CET

> On Tue, 27 Feb 2007, Folker Schamel wrote:
>
>>> On 2/26/07, *Justin Johnson* <justinjohnson@gmail.com
>>> <mailto:justinjohnson@gmail.com>> wrote:
>>>
>>> What information is available on what this merge tracking will include?
>> Just for curiosity:
>> (For all our use cases, the features of svnmerge.py are fine.)
>>
>> When merging something from branch A -> B,
>> will merge respect already merged changes B -> A?
>> (Like svnmerge.py --bidirectional.)
>> Will merge respect already merged changes A -> X -> B or B -> X -> A?
>> (Not supported by svnmerge.py.)
>
> The specs can be found here:
>
> http://subversion.tigris.org/merge-tracking/
>
> If you can't determine the answer from reading the specs, let us know.

Yes, I know these documents.
I don't find the particular location again, but I think I found some
implementation note indicating that "B -> A" handled.
But I didn't find a note dealing with the other cases "A -> X -> B"
and "B -> X -> A", so I suppose they are not handled, is this correct?

Thanks!!

Cheers,
Folker

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Mar 8 09:08:06 2007

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