I'm using svnmerge.py to deal with development branches and am quite happy
with the workflow except for one thing that I'm not sure how to deal with.
Let's assume, that I have a development branch that has been used for a
while and several changes in the main trunk have been merged into the
development branch.
I now merge development branches back to trunk using the following command
in a pristine working copy of the trunk:
$ svnmerge.py init BRANCH_URL
$ svn ci -F svnmerge-commit-message.txt
$ svnmerge.py merge --bidirectional
$ svnmerge.py uninit -S BRANCH_NAME
But now instead of removing the development branch I would like to continue
working in the development branch and I cannot figure out how this is
supposed to work or to be more precise, how to tell svnmerge.py that have
now merged back all changes into the trunk.
Thank you
-Dieter
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-30 15:24:21 CEST