User Tools

Site Tools


difx:subversion

Subversion

The following are some useful subversion commands

A useful reference is http://svnbook.red-bean.com/en/1.4/svn.branchmerge.commonuses.html

Create a branch

svn copy -m "Create new branch" https://svn.atnf.csiro.au/difx/libraries/mark5access/trunk https://svn.atnf.csiro.au/difx/libraries/mark5access/branches/NEWBRANCH

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 https://svn.atnf.csiro.au/difx/mpifxcorr/trunk

alternatively

> 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

Remove unwanted changes

If you want to abandon unwanted local modifications

> svn revert Makefile.am

Determine Repository URL

If you cannot remember the URL for the base repository,

> svn info
difx/subversion.txt · Last modified: 2019/09/12 10:47 by chrisphillips