Trusted, Bureaucrats, Administrators
1,660
edits
Changes
no edit summary
<source>
== 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,
<source lang="bash">
svn co svn+ssh://$RUSER@svn.gna.org/svn/relax/trunk relax-trunk
# or update a previously checked out version,
svn up
<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
<source>
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
# and your private branch deleted
svn rm svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH
<source>
== See also ==
[[Category:git]]