[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: Sander Striker <striker_at_apache.org>
Date: 2003-04-10 21:43:57 CEST

> 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.

Note that in the proposals examples I wrote that
MRCA = Trunk@X = Branch1@Y. Forget about the Branch1@Y
part. Although the two are textually equivalent, Branch1@Y
cannot be viewed as a common ancestor. Sorry for possible
cause for confusion.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Thu Apr 10 21:44:53 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.