svnmerge.py after merge development branch into main trunk

[Dieter Oberkofler <d....@qualiant.at>]

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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svnmerge.py after merge development branch into main trunk

[Raman Gupta <ro...@fastmail.fm>]

Dieter Oberkofler wrote:
> 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

Note that in the latest version of svnmerge.py the --bidirectional
flag is no longer required.

> $ 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.

Just skip the uninit if you want to continue working on the branch.
The svnerge.py merge operation records the merge to trunk, but you
lose that information when you do uninit.

Cheers,
Raman Gupta

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org