Quickies for Subversion

---

General

• Add new directory directly to repository [permalink]
  % svn mkdir -m "initial revision" file:///usr/local/svnroot/MilleBorks

• Adding new project to repository (1 project : 1 repository) [permalink]
  The Subversion folks recommend that project have a branches, tag, and trunk directory, to make doing things like branches and tags easier. Importing this way will mean your repository will only have this one project.

  % mkdir DungeonBorkventure
  % cd DungeonBorkventure
  % mkdir branches tags trunk
  # put source files into trunk
  % svn import . file:///usr/local/svnroot -m "initial checkin"
  % cd ..
  % rm -rf DungeonBorkventure  # or move it aside
  % svn checkout file:///usr/local/svnroot/trunk DungeonBorkventure
  % cd DungeonBorkventure
  # and get to work

• Adding new project to repository (multiple projects : 1 repository) [permalink]
  To have multiple projects in one repository, you have to create directories in the repository first to hold the project, then import the code. Here is importing two projects, MilleBorks and DungeonBorkventure

  First, make the directories in the repository:

  % svn mkdir -m "initial revision" file:///usr/local/svnroot/DungeonBorkventure
  % svn mkdir -m "initial revision" file:///usr/local/svnroot/MilleBorks

  Then import the different code bases:

  % cd /path/to/DungeonBorkventure
  % svn import -m "initial revision" . file:///usr/local/svnroot/DungeonBorkventure
  % cd /path/to/MilleBorks
  % svn import -m "initial revision" . file:///usr/local/svnroot/MilleBorks

  Then checkout working copies of the projects:

  % cd /work/and/play/area
  % svn checkout file:///usr/local/svnroot/MilleBorks/trunk MilleBorks
  % svn checkout file:///usr/local/svnroot/DungeonBorkventure/trunk DungeonBorkventure
  

• Ignoring files [permalink]
  I don't want subversion to mess with some files, or to tell me about them when doing an svn status. Add this to your ~/.subversion/config file.

  [miscellany]
  global-ignores = build *.mode* *.pbxuser *~.nib .DS_Store *~
  

  Now it won't bug me about the build directory the -per-user Xcode files, nib backup files, the #$&!! .DS_Store file that the Finder litters everywhere, and also don't bug me about emacs backup files.

  You can search for global-ignores in that file to see some info about the setting. You might want to check out Spring Cleaning with Subversion too.

• Make archive of locally modified files in subversion [permalink]
  

  $ zip ~/modified.zip $(svn status | grep ^M | awk '{ print $2;}')
  

  (Bash syntax)

• Making a new FSFS repository [permalink]
  % svnadmin create --fs-type fsfs /usr/local/svnroot/

• Making a tag / branch [permalink]
  This will make a tag called "stable-1" of the current trunk revision:

  % svn copy file:///usr/local/svnroot/HackDie/trunk 
              file:///usr/local/svnroot/HackDie/tags/stable-1 
              -m "tag for HackDie internal stable release #1"
  

• Seeing what files will come down in the next update [permalink]
  To see if folks have committed changes that'll get brought down in the next update.

  % svn status --show-updates

  You can specify files and directories of interest.

• Showing all files that changed at a particular revision [permalink]
  If you're inside of a working copy, you can do:

  % svn log -v -r 373
  ------------------------------------------------------------------------
  r373 | markd | 2005-06-22 16:05:38 -0400 (Wed, 22 Jun 2005) | 1 line
  Changed paths:
     A /xyz/trunk/docs/bugreports/4158233-nsbrowser
     A /xyz/trunk/docs/bugreports/4158233-nsbrowser/browser-rows.png
     A /xyz/trunk/docs/bugreports/4158233-nsbrowser/browserdraw.tar.gz
     A /xyz/trunk/docs/bugreports/4158233-nsbrowser/bug.txt
  
  initial revision
  ------------------------------------------------------------------------
  

  and you can look repository-wide too: % svn log -v -r 373 file:///usr/local/svnroot/

• Subversion over ssh [permalink]
  To access a repository that lives over ssh (vs http or file), use the svn+ssh protocol thingie in the commands, like
  % svn mkdir -m "initial revision" svn+ssh://borkware.com/path/to/svnroot/thingie

Hacks

• Adding blah@2x.png files to subversion [permalink]
  I personally dislike Apple's "@2x" nomenclature for high-def images for iDevices. But we're stuck with it. The embedded at-sign confuses subversion unless you append the file name with an at-sign:

  % svn add bunnies@2x.png
  svn: warning: 'bunnies' not found
  % svn add bunnies@2x.png@
  A         bunnies@2x.png
  

  (thanks to Gus Mueller, Mike Ash, and Guy English)

• Changing a working tree's repository location [permalink]
  Sometimes your subversion repository moves (like if you're using a private one and the machine changes addresses). Here's how to repoint a working tree to the new location (handy if there's outstanding changes that are a pain to move over to a fresh checkout)

  % svn switch --relocate http://from-address.flongswozzle.net http://to-address.borkware.com

  Muchos thankos to Lucas Eckels for the tip.

• Changing the text for a commit [permalink]
  Occasionally, when I'm checking in a bunch of files individually (say each file has a distinct change), I might accidentally do something dumb like a svn commit without a filename, and suddenly everything's checked in. Sigh. So now the commit message is for a particular one-file change, and now the rest of the files have this comment. Sigh again.

  If you're in control of the repository, you can put the proper log message into a text file, and hack your repository (assuming oop.txt has the new comment contents, and it was revision 285 that accidentally got All The Things):

  % cd parent-directory-of-repository
  % svnadmin --bypass-hooks setlog ./svnroot -r 285 /tmp/oop.txt
  

  If your repository is more than "just your own thing", you might want to follow the more complicated instructions at at the Subversion FAQ.

---