Git branch creation - Revision history

Bugman: Transclusion of the {{historical svn}} template.

2017-10-27T11:51:49Z

Transclusion of the {{historical svn}} template.

2015-10-15T14:00:59Z

Forced creation of a TOC - this will improve the formatting on the main page 'Did you know...' section.

2014-06-09T09:42:24Z

Branch creation

2014-05-22T08:47:14Z

Check out the branch

2014-05-21T16:10:22Z

Keeping the branch up to date using svnmerge.py

2014-05-19T02:01:32Z

Check out the branch

2014-05-18T21:05:24Z

Check out the branch

2014-05-18T20:23:42Z

Merging the branch back into the main line

2014-05-18T20:19:47Z

Keeping the branch up to date using svnmerge.py

2014-05-18T20:17:28Z

Keeping the branch up to date using svnmerge.py

← Older revision		Revision as of 14:00, 15 October 2015
Line 1:		Line 1:
		+	__TOC__
		+
	== Links ==		== Links ==
	http://www.nmr-relax.com/manual/Branches.html		http://www.nmr-relax.com/manual/Branches.html

@@ Line 29: / Line 29: @@
 cp ../relax_trunk/relax_commit.txt .
 git config --add commit.template "relax_commit.txt"
 # Make an executable to this.
 ln -s $PWD/relax $HOME/bin/relax_${BRANCH}
 #Now check out the svn branch, which we will keep to perform certain svn commands.

@@ Line 35: / Line 35: @@
 # And build
 scons
 #Now check out the svn branch, which we will keep to perform certain svn commands.

@@ Line 72: / Line 72: @@
 <source lang="bash">
 svn ci -F svnmerge-commit-message.txt
 </source>

@@ Line 32: / Line 32: @@
 ln -s $PWD/relax $HOME/bin/relax_${BRANCH}
 # If you have a Mac
-sed -i "" "s/archs = \['i386', 'ppc', 'x86\_64']/archs = \['x86\_64'\]/g" sconstruct
+sed -i "" "s/archs = \['i386', 'ppc', 'x86\_64']/archs = \['i386', 'x86\_64'\]/g" sconstruct
 # And build
 scons

@@ Line 82: / Line 82: @@
 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
+svnmerge.py init svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH
 #Then commit the change
 svn ci -F svnmerge-commit-message.txt
@@ Line 93: / Line 92: @@
 To merge the branch and commit the changes, type
 <source lang="bash">
-./svnmerge.py merge -bidirectional
+svnmerge.py merge -bidirectional
 svn ci -F svnmerge-commit-message.txt
 </source>
@@ Line 99: / Line 98: @@
 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
+svnmerge.py uninit -S svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH
 # the changes committed
 svn ci -F svnmerge-commit-message.txt
@@ Line 105: / Line 104: @@
 svn rm svn+ssh://$RUSER@svn.gna.org/svn/relax/branches/$BRANCH
 </source>
 == See also ==
 [[Category:git]]

@@ Line 60: / Line 60: @@
 # See log
-svn log --limit 10
+svn log -l 5
 # To keep up to date, simply type