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

Re: To reintegrate or not to be ...

From: Mark Mielke <mark_at_mark.mielke.cc>
Date: Tue, 18 Nov 2008 20:33:48 -0500

Mark Phippard wrote:
> The idea is that branches are cheap and it makes sense to "re-branch".
> If you do not re-branch the point is that you cannot simply do
> another synch up merge with trunk as you had been doing before. If
> you do, then it will attempt to merge back the merge you did from the
> branch. So you either need to do a 2-URL merge to synch trunk back to
> the branch or perhaps a --record-only merge in the branch so that it
> does not try to merge it back

This subject interests me greatly - but I feel like I'm coming into the
middle, so apologies in advance for any stupidity I show... :-)

Why can't Subversion track the "re-integration" and only calculate
merges back to the re-integration point?

I don't see why Subversion branches are different from any other system.
Why would this problem by unique to Subversion and why can it not be
easily solved?


Mark Mielke <mark_at_mielke.cc>
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-19 02:34:45 CET

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.