Dealing with vendor branches
----------------------------

Full documentation at http://svnbook.red-bean.com/en/1.1/ch07s05.html
Quick reference:

$SVN is the full URL to the SVN root, e.g. https://jim.sh/svn/jim

Initial import and copy to main branch:
    tar xvzf foo-1.0.tgz
    svn import foo-1.0 $SVN/vendor/foo/current           -m 'initial import'
    svn copy $SVN/vendor/foo/current $SVN/vendor/foo/1.0 -m 'tag foo 1.0'
    svn copy $SVN/vendor/foo/1.0 $SVN/trunk/foo          -m 'copy foo 1.0'

Vendor releases foo-1.1:
    tar xvzf foo-1.1.tgz
    svn_load_dirs -t 1.1 $SVN/vendor/foo current foo-1.1

Merge foo-1.1 into main branch:
    cd working-copy/trunk/
    svn merge $SVN/vendor/foo/1.0 $SVN/vendor/foo/1.1 foo
    svn commit -m 'merge foo 1.1 into main branch'

Noting the version in the log message for the merge is useful for later merges.

- Jim Paris <jim@jtan.com>