Trusted, Bureaucrats, Administrators
1,660
edits
Changes
Jump to navigation
Jump to search
cp ../relax_trunk/relax_commit.txt .
git config --add commit.template "relax_commit.txt"
# Make an executable to this.
ln -s relax $HOME/bin/relax_${BRANCH}
#Now check out the svn branch, which we will keep to perform certain svn commands.
For info about the commit template, see [[Format_commit_logs | Format commit logs]].
== Keeping the branch up to date using svnmerge.py ==
As you develop your branch, changes will be occurring simultaneously within the main line. These changes should be merged into your branch on a regular basis to avoid large incompatible changes from forming between the two branches. To simplify this process, the svnmerge.py script located at [http://www.orcaware.com/svn/wiki/Svnmerge.py http://www.orcaware.com/svn/wiki/Svnmerge.py] can be used. It is best to download the trunk version from that page, unless that version is non-functional.
<source lang="bash">
cd ${BRANCH}_svn
# Get the svnmerge script
curl http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/svnmerge/svnmerge.py -o svnmerge.py
#Once you have this script, the merging from the main line to your private branch must be initialised by typing, from within the checked out copy of your branch
svnmerge.py init
#This then needs to be committed using the automatically generated log
svn ci -F svnmerge-commit-message.txt
# To keep up to date, simply type
svnmerge.py merge
<source>
If conflicts have occurred please refer to the Subversion book at [http://svnbook.red-bean.com/ http://svnbook.red-bean.com/] for information on how to resolve the problem. Otherwise, or once fixed, the main line revisions merged into your branch can be committed using the automatically generated log file:
<source lang="bash">
svn ci -F svnmerge-commit-message.txt
<source>
== See also ==
[[Category:git]]
