[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 <s.striker_at_striker.nl>
Date: 2003-04-13 10:33:10 CEST

> From: Tom Lord [mailto:lord@emf.net]
> Sent: Sunday, April 13, 2003 1:30 AM

> me:
> >> 2) I don't think I've seen any solution here to the "transitive merge"
> >> problem, though perhaps I missed it.
> >>
> brane:
> > If I understand correcly what you mean by transitive merge, then
> > recording the branch points on the way to the MRCA is exactly what we
> > need to solve the problem, isn't it?
> It remains entirely possible, but I don't think so. If you want to
> point me to a specific message to re-re-review, please do. Sorry if
> I'm raising a false spectre.
> I'm talking about the problem illustrated here:
> Suppose that I have three branches, A, B, and C. Lowercase letters
> here will be revision numbers.
> I'm going to merge the changes B:a-b into A. Somewhere in B:a-b, I
> merged C:c-d into B.
> At the end of my merge into A, shouldn't A have merge history from C
> (specifically changes C:c-d)?

Ah, you mean something like Example 2, M1? Or M4 (which resembles
your text above even more).


PS. I'm referring to the examples in the pdf attached to this message:

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 14 01:10:32 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.