Merging with Subversion

NOTE: This page has been migrated from the wiki to http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html - any future updates should be made there and not here.