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

Reply via email to