Merging branches with SVN

Development
1

Moin folks

I created the strigi-integration-branch a couple of days ago. Now I want to
sync the branch with trunk/ to reduce the diff as much as possible.
I googled a bit and found that these commands should work. But they don’t…

svn merge
https://cniehaus@avogadro.svn.sourceforge.net/svnroot/avogadro/trunk/
https://cniehaus@avogadro.svn.sourceforge.net/svnroot/avogadro/branches/strigi-integration

or

svn merge -r681:HEAD
https://cniehaus@avogadro.svn.sourceforge.net/svnroot/avogadro/trunk/
https://cniehaus@avogadro.svn.sourceforge.net/svnroot/avogadro/branches/strigi-integration

Has anybody on this list ever done this?

Carsten

2

Moin

For future reference: To sync a branch with trunk you need to know the
revision with which you branched off. This is 679 in my case. Then you simply
do:

svn merge -r679:HEAD
https://$USERNAME@avogadro.svn.sourceforge.net/svnroot/avogadro/trunk/

That’s it :slight_smile:

Carsten

3

On Oct 3, 2007, at 4:30 AM, Carsten Niehaus wrote:

For future reference: To sync a branch with trunk you need to know the
revision with which you branched of

You can also use svnmerge:

http://www.orcaware.com/svn/wiki/Svnmerge.py

Sorry, I forgot about your original question or I would have
responded sooner!

Cheers,
-Geoff