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

Question on "svn merge --reintegrate" and svnmerge.py with 1.5

From: Jorge M <jmedina_at_e-dialog.com>
Date: Tue, 27 Jan 2009 16:40:07 -0500

I found this paragraph in the Subversion (1.5) book (Page 94).
"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"

Does anyone knows if this has changed? I find it totally unnaceptable
that when you merge your branch back into the trunk, the branch becomes
unusable and you need to create a new one.

Is it possible to still use svnmerge.py script with Subversion 1.5 (We
have now upgraded our repository and some of the clients)? This tool
(svnmerge.py) does allow to merge from and to the trunk multiple times
until the bracnh is explicitly closed.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-27 23:35:25 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.