SubVersionCookBook

Pointers

• SubVersion — other examples
• SubVersionOverSSH - remote subversion via ssh
• svk

initial import

    mkdir /path/svnroot
    svnadmin create /path/svnroot/myproject
    svn import mytree file:///path/svnroot/myproject/trunk
    mv mytree mytree.bak
    svn co file:///path/svnroot/myproject/trunk myproject

    svn mkdir file:///path/svnroot/myproject/tags
    svn mkdir file:///path/svnroot/myproject/branches

properties

• http://svnbook.red-bean.com/en/1.0/re23.html

    # some commonly used properties
    svn propset svn:executable ON somescript
    svn propset svn:mime-type image/jpeg foo.jpg

    # set a custom property
    svn propset owner sally foo.c

    # change previous commit log message
    svn propset --revprop -r 25 svn:log "Journaled about trip to New York."

Shared repository svn+ssh

Make sure that:

• all your svn users are members of a common group
• this group is the group id of the db/ and locks/ subdirectories of your repository
• the above subdirectories are writable by this group

create a repository

• svnadmin create svn_repos

dump and load

• backup and restore

    svnadmin dump /home/rafael/svn | gzip -9 > dump.gz
    gunzip -c dump.gz | svnadmin load /home/rafael/svn

    svnadmin dump /path/to/reponame > /tmp/reponame.dump
    scp /tmp/reponame.dump user@server.domain.com:/tmp/
    svnadmin create /path/to/reponame
    svnadmin load /path/to/reponame < /tmp/repo1.dump
    chown -R svn:svnusers /path/to/reponame ; chmod -R g+w /path/to/reponame/db/

hook emails

• http://search.cpan.org/dist/SVN-Notify/ - colorized html emails
  • http://www.badgers-in-foil.co.uk/projects/cvsspam/example.html

Commands

• svn checkout <repository/project>
• svn import <directory> <repository> -m "initial import"
• svn update <file>
  • automatically merges in updates if out-of-date
• svn commit <file> -m "comment"
• svn diff <file>
• svnlook tree \svn_repository
• branching

  svn copy file:///repository/project file:///repository/project_R1.0 -m "comment"

• merging

  svn merge -r6:9 file:///svn_repository/project_R1.0/file file

Ignoring files

    # launch an editor to edit ignore patterns, one per line
    svn propedit svn:ignore .

    ~/.subversion/config
    [miscellany]
    global-ignores = *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#* .DS_Store *.log *.aux *.bbl *.blg *.dvi

• seeing ignored files
  • svn status --no-ignore
• global-ignores
  • default value:

     *.o *.lo *.la #*# .*.rej *.rej .*~ *~ .#*. 

Converting a directory to a subversion archive in-place

    $ cd /path/to/project/
    $ svn mkdir proto://server/svn/project/trunk
    $ svn checkout proto://server/svn/project/trunk .
    $ svn add *
    $ svn commit

Externals

    svn co svn://host/project1/trunk project1
    svn propset svn:externals "project2 svn://hostname/project2/trunk" project1

• Subversion will not automatically commit changes you make to a checked-out external when you commit changes to the project that included it.
• recommend to treat dependencies as read-only in each project

Patches

    # create a patch file
    svn diff > mychanges.patch

    # apply the patch file in same directory it was created
    patch -p0 -i mychanges.patch

Merging

• svnmerge.py - script to track merges
• http://subversion.tigris.org/faq.html#merge-using-tags
  • merging without version numbers
  • uses trace branches that are updated after each merge
• Subversion 1.5: real merge tracking support!!!