[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: Purple Streak <mrpurplestreak_at_googlemail.com>
Date: Tue, 18 Nov 2008 21:09:38 +0000

2008/11/18 David Glasser <glasser_at_davidglasser.net>:
> We used to not have reintegrate. This is because we all forgot that,
> in the Subversion model, the operation of merging to your development
> branch and the operation of merging back from it are actually
> incredibly different (the former is a 1-URL rev-range diff, and the
> latter is a 2-URL diff). Now we have reintegrate. Perhaps this is
> lame, but that's how Subversion branching works.

Is this true from the SVN book...

"In Subversion 1.5, once a --reintegrate merge is done from branch to
trunk, the branch is no longer usable for further work. It's not able
to correctly absorb new trunk changes, nor can it be properly
reintegrated to trunk again. For this reason, if you want to keep
working on your feature branch, we recommend destroying it and then
re-creating it from the trunk"

So once you reintegrate that means the branch is dead (which means you
must merge everything back in one go and start a new branch)?

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-18 22:09:50 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.