os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use "^" refer to the base URL of the SVN repository.

Browse source 
Subversion has supported this syntax for many years.

Reviewed by:	bcr
Differential Revision:	https://reviews.freebsd.org/D21949
This commit is contained in:
Brooks Davis 2019-12-20 22:21:45 +00:00
parent d6532f8621
commit 46a818d5d3
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=53701
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml
View file

@ -242,12 +242,12 @@
tree prior to importing new sources is also needed:</para>
<screen>&prompt.user; <userinput>cd head/contrib/<replaceable>foo</replaceable></userinput>
&prompt.user; <userinput>svn merge --record-only <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist@<replaceable>12345678</replaceable> .</userinput>
&prompt.user; <userinput>svn merge --record-only ^/vendor/<replaceable>foo</replaceable>/dist@<replaceable>12345678</replaceable> .</userinput>
&prompt.user; <userinput>svn commit</userinput></screen>
<para>where <replaceable>svn_base</replaceable> is the base
directory of your <acronym>SVN</acronym> repository, e.g.,
<literal>svn+ssh://svn.FreeBSD.org/base</literal>.</para>
<para>With some shells, the <literal>^</literal> in the
above command may need to be escaped with a
backslash.</para>
</step>
<step>
@ -337,7 +337,7 @@
should tag it for future reference. The best and quickest
way is to do it directly in the repository:</para>
<screen>&prompt.user; <userinput>svn copy <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/<replaceable>9.9</replaceable></userinput></screen>
<screen>&prompt.user; <userinput>svn copy ^/vendor/<replaceable>foo</replaceable>/dist <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/<replaceable>9.9</replaceable></userinput></screen>
<para>To get the new tag, you can update your working copy
of
@ -361,7 +361,7 @@
<screen>&prompt.user; <userinput>cd head/contrib/<replaceable>foo</replaceable></userinput>
&prompt.user; <userinput>svn update</userinput>
&prompt.user; <userinput>svn merge --accept=postpone <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</userinput></screen>
&prompt.user; <userinput>svn merge --accept=postpone ^/vendor/<replaceable>foo</replaceable>/dist</userinput></screen>
<para>Resolve 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:</para>
<screen>&prompt.user; <userinput>svn diff --no-diff-deleted --old=<replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist --new=.</userinput></screen>
<screen>&prompt.user; <userinput>svn diff --no-diff-deleted --old=^/vendor/<replaceable>foo</replaceable>/dist --new=.</userinput></screen>
<para><option>--no-diff-deleted</option> tells
<acronym>SVN</acronym> not to check files that are in the