Differences

This shows you the differences between two versions of the page.

--- versioncontrol:svn_merging [2006/09/24 21:15] – NikClayton
+++ versioncontrol:svn_merging [2022/10/07 03:00] (current) – Move bakeoff stuff under a single namespace KubilayKocak
@@ Line 1: / Line 1: @@
+**NOTE**: This is from the VCS bakeoff.
+Please see http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html for how to merge in the %%FreeBSD%% project.
 ====== Merging with Subversion ======
-**Note:** Nik's actively updating this page.  I'll remove this note when I've finished.
+**NOTE**: Subversion 1.5 has //merge tracking// built-in. You no longer need svnmerge. See http://subversion.tigris.org/svn_1.5_releasenotes.html#merge-tracking for more information.
 ===== Background =====
@@ Line 25: / Line 29: @@
 ==== Repository creation ====
-First, we need to create a repository and populate it with some files.  This example follows the suggested layout described in ["SVN Repo Layout"].  We create ''%%freebsd/src/trunk/%%'', and a ''%%projects%%'' directory, ready to be populated with two long lived projects.
+First, we need to create a repository and populate it with some files.  This example follows the suggested layout described in [[/SVN_Repo_Layout|SVN_Repo_Layout]].  We create ''%%freebsd/src/trunk/%%'', and a ''%%projects%%'' directory, ready to be populated with two long lived projects.
 <code>