Merging the branch back into the main line

Once you have completed the modifications desired for your branch, all changes which have occurred in the main line have been merged using svnmerge.py, and the changes have been approved for merging back into the main line - then your branch can be merged. First check out a copy of the main line,


$ svn co svn+ssh://xxxxx@svn.gna.org/svn/relax/trunk relax-trunk

or update a previously checked out version,


$ svn up

Then svnmerge.py can be utilised again. First initialise the merging process by typing, from within the checked out copy of the main line,


$ svnmerge.py init svn+ssh://xxxxx@svn.gna.org/svn/relax/branches/molmol_macros

Then commit the change


$ svn ci -F svnmerge-commit-message.txt

To merge the branch and commit the changes, type


$ svnmerge.py merge -bidirectional


$ svn ci -F svnmerge-commit-message.txt

Finally the merge properties need to be removed


$ svnmerge.py uninit -S svn+ssh://xxxxx@svn.gna.org/svn/relax/branches/molmol_macros

the changes committed


$ svn ci -F svnmerge-commit-message.txt

and your private branch deleted


$ svn rm svn+ssh://xxxxx@svn.gna.org/svn/relax/branches/molmol_macros

The relax user manual (PDF), created 2016-10-28.