Index: head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
===================================================================
--- head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
+++ head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
@@ -242,12 +242,12 @@
tree prior to importing new sources is also needed:
&prompt.user; cd head/contrib/foo
-&prompt.user; svn merge --record-only svn_base/vendor/foo/dist@12345678 .
+&prompt.user; svn merge --record-only ^/vendor/foo/dist@12345678 .
&prompt.user; svn commit
- where svn_base is the base
- directory of your SVN repository, e.g.,
- svn+ssh://svn.FreeBSD.org/base.
+ With some shells, the ^ in the
+ above command may need to be escaped with a
+ backslash.
@@ -337,7 +337,7 @@
should tag it for future reference. The best and quickest
way is to do it directly in the repository:
- &prompt.user; svn copy svn_base/vendor/foo/dist svn_base/vendor/foo/9.9
+ &prompt.user; svn copy ^/vendor/foo/dist svn_base/vendor/foo/9.9To get the new tag, you can update your working copy
of
@@ -361,7 +361,7 @@
&prompt.user; cd head/contrib/foo
&prompt.user; svn update
-&prompt.user; svn merge --accept=postpone svn_base/vendor/foo/dist
+&prompt.user; svn merge --accept=postpone ^/vendor/foo/distResolve any conflicts, and make sure that any files
that were added or removed in the vendor tree have been
@@ -369,7 +369,7 @@
a good idea to check differences against the vendor
branch:
- &prompt.user; svn diff --no-diff-deleted --old=svn_base/vendor/foo/dist --new=.
+ &prompt.user; svn diff --no-diff-deleted --old=^/vendor/foo/dist --new=. tells
SVN not to check files that are in the