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

Re: [PROPOSAL] Merging Improved

From: Branko Čibej <brane_at_xbc.nu>
Date: 2003-04-10 23:03:02 CEST

Sander Striker wrote:

>>From: Sander Striker [mailto:striker@apache.org]
>>Sent: Thursday, April 10, 2003 9:17 PM
>>Note that example 2 and 3 contain some flaws. Please
>>disregard those until I repost.
>Ok, fixed.
>I also found out that I forgot about one rule in the
>bookkeeping process:
>If the MRCA of M and L is not the same path as M, then
>a line needs to be added to svn:merge that contains the
>MRCA of M and the HEAD of the path of the MRCA of M and L
>(you might need to re-read that twice).
>Example 3. M1 is a good example of this.

Let me see if I understand... that's where you got the trunk@34 line in
M1 in example 3, right? Hm, (scratch scratch). Isn't that always the
same as the branchpoint of M's path?

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 10 23:03:51 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.