User Tools

Site Tools



The following are some useful subversion commands

A useful reference is

Create a branch

svn copy -m "Create new branch"

Merge changes from trunk onto a branch

Note this may be easier on Subversion 1.5 and newer - see below

  • Find the revision in which the branch was created:
> svn log -v --stop-on-copy
r4048 | ChrisPhillips | 2011-12-08 08:00:08 +1100 (Thu, 08 Dec 2011) | 1 line
Changed paths:
   A /mpifxcorr/branches/askap (from /mpifxcorr/trunk:4029)

askap branch
  • Find out what the most recent version of the repository is
> svn update
At revision 4152.
  • Merge trunk changes onto the current branch. Note the first number will usually be one before the first change you want to apply.
> svn merge -r 4029:4152


> svn merge -r 4029:4152 ^/mpifxcorr/trunk

With newer versions of subversion, you can just do something like (from a clean copy of branch):

> svn merge  ../../trunk

Cherrypick a specific commit from a branch to trunk

If a change has been made on a branch which you want to copy back to trunk

> cd $DIFXROOT/libraries/difxio/trunk/difxio
> svn merge -c NN ^/master_tags/DiFX-2.8/libraries/difxio/difxio/difx_eop.c
> svn commit -m "Merge from DIFX-2.8 branch"

Remove unwanted changes

If you want to abandon unwanted local modifications

> svn revert

Determine Repository URL

If you cannot remember the URL for the base repository,

> svn info

List your own changes on a branch

> cd mybranch
> svn log -v --stop-on-copy | sed -n '/AUTHORNAME/,/------/p' |

Change AUTHORNAME to your subversion username

difx/subversion.txt · Last modified: 2022/12/01 10:29 by chrisphillips