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

Svn merge reintegrate question

From: Erik Andersson <kirean_at_gmail.com>
Date: Wed, 7 Mar 2012 15:47:31 +0100

I'm a svnmerge.py user, trying to understand core svn merging.

If creating branches from trunk, you cannot have two release branches and
keeping the release branches alive with reintegrate?

When the second release branch is merged to the trunk, the first release
branch can no longer be merged to trunk with reintegrate because then the
content from the second release branch will be removed from the trunk if
you reintegrate the first branch with trunk.

I hope this script example explains it:
http://paste.pocoo.org/show/260265/

I would really appreciate any feedback on this.

Cheers / Erik
Received on 2012-03-07 15:48:08 CET

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

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