Trusted, Bureaucrats, Administrators
1,660
edits
Changes
no edit summary
# To keep up to date, simply type
./svnmerge.py merge
</source>
Then svnmerge.py can be utilised again. First initialise the merging process by typing, from within the checked out copy of the main line,
<source lang="bash">
./svnmerge.py init svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH
#Then commit the change
svn ci -F svnmerge-commit-message.txt
To merge the branch and commit the changes, type
<source lang="bash">
./svnmerge.py merge -bidirectional
svn ci -F svnmerge-commit-message.txt
</source>
Finally the merge properties need to be removed
<source lang="bash">
./svnmerge.py uninit -S svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH
# the changes committed
svn ci -F svnmerge-commit-message.txt