Craig's SVN notes

• Version Control with Subversion (online reference book)
• Subversion FAQ
• A Crash Course in Subversion, Part 2
• Properties:

      (List properties)
      % svn proplist main.c
      Properties on 'main.c':
        svn:keywords
        svn:eol-style
  
      (Get properties)
      % svn propget svn:keywords main.c
      Author Date Id Revision
  
      (Set ignored file list)
      % svn propedit svn:ignore .
  
      (Set keywords)
      % svn propset svn:keywords 'Author Date Id Revision' main.c
  
      (Set end of line style)
      (Note: incompatible with configure scripts generated by autoconf 2.62)
      % svn propset svn:eol-style native main.c
  
      (Set executable)
      % svn propset svn:executable '*' install-sh
  

• Initial creation::

      (local)
      % svnadmin create --fs-type fsfs /usr/src/svn/project
      % svn mkdir file:///usr/src/svn/project/trunk -m ''
      % svn mkdir file:///usr/src/svn/project/branches -m ''
      % svn mkdir file:///usr/src/svn/project/tags -m ''
  

• Initial checkout:

      (HTTP)
      % svn checkout http://svn.icir.org/bro/trunk/bro bro-svn
  
      (SSH)
      % svn checkout svn+ssh://fred@nosuch.xyz/usr/src/svn/project/trunk project
  
      (local)
      % svn checkout file:///usr/src/svn/project/trunk project
  

• Diff:

      (context)
      % svn diff -r70:72 main.c
  
      (straight)
      % svn diff --diff-cmd diff --extensions --normal -r70:72 main.c
  
      (whitespace)
      % svn diff --diff-cmd diff --extensions '--normal -i' -r70:72 main.c
  
      (whitespace and ignore case)
      % svn diff --diff-cmd diff --extensions '--normal -iw' -r70:72 main.c
  

• Tagging:

      % svn copy file:///usr/src/svn/project/trunk \
  	file:///usr/src/svn/project/release-1.3 -m "release-1.3"
  

• Edit a log message:

      (Enable on the repo system)
      % cd /usr/src/svn/project/hooks
      % cp -pi pre-revprop-change.tmpl pre-revprop-change
      % chmod +x pre-revprop-change
  
      (Edit on the repo system)
      % svn propedit -r58 --revprop svn:log \
  	file:///usr/src/svn/project
  
      (Edit from a different host)
      % svn propedit -r58 --revprop svn:log \
  	svn+ssh://fred@nosuch.xyz/usr/src/svn/project
  

• .subversion/config:

      (Don't forward ssh creds, X11 or ports)
      ssh = ssh -ax -o clearallforwardings=yes
  
      (Default svn keywords)
      *.c = svn:eol-style=native;svn:keywords=Author Date Id Revision
      *.h = svn:eol-style=native;svn:keywords=Author Date Id Revision
  

• Switch the repository root:

      % svn switch --relocate \
  	file:///usr/src/svn/apache22-conf \
  	file:///usr/src/svn/crd-apache22-conf
  
  

• Finding a deleted file:

  To find the revisions a file exist in:

      % svn log --verbose | grep -A5 -B5 mime.types
  

• Undelete a file:

  The basic strategy is to identify the version you want to resurrect and then use "svn copy".

  • Update your working copy and select the version:

        % svn up
        % svn log -v | more
    

  • Make a temporary working copy in a new directory and check out the version that has the file you want:

        % svn co -r123 \
    	svn+ssh://fred@nosuch.xyz/usr/src/svn/project/trunk \
    	/var/tmp/temp-project
    

  • Copy the file (with history) from the temporary working copy to the normal working copy and checkin:

        % svn copy /var/tmp/temp-project/foo.c foo.c
        % svn st
        % svn ci foo.c
    

• Miscellaneous:

      % svn update
      % svn commit
      % svn status
      % svn info
  

Note that this method can also be used to copy a file with history from a completely different repo. RCS and CVS to SVN:

• CVS to SVN Crossover Guide
• Migrating from CVS to Subversion
• Example using cvs2svn:

  Create project-cvs which contains ,v files and an empty CVSROOT directory. The output/target directory (project-svn) must not exist. If there are subdirectories, just make sure to move all the ,v files out of the RCS dirs (and delete the empty RCS dirs) Note: Install cvs2svn and coreutils (gsort) ports.

      cvs2svn \
  	--svnrepos project-svn \
  	--fs-type fsfs \
  	--sort=/usr/local/bin/gsort \
  	project-cvs
  

• RCS Howto (RCS reference)