svn commit: r53701 - head/en_US.ISO8859-1/books/developers-handbook/policies
Brooks Davis <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: brooks (src,ports committer) Date: Fri Dec 20 22:21:45 2019 New Revision: 53701 URL: https://svnweb.freebsd.org/changeset/doc/53701 Log: Use "^" refer to the base URL of the SVN repository. Subversion has supported this syntax for many years. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D21949 Modified: head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml Modified: head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml Thu Dec 19 04:10:01 2019 (r53700) +++ head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml Fri Dec 20 22:21:45 2019 (r53701) @@ -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 _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-doc-all To unsubscribe, send any mail to "[email protected]"