svn commit: r46984 - head/en_US.ISO8859-1/articles/committers-guide
Xin LI <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
Author: delphij Date: Tue Jul 14 23:38:20 2015 New Revision: 46984 URL: https://svnweb.freebsd.org/changeset/doc/46984 Log: s/svn.freebsd.org/repo.freebsd.org/ when appropriate. I have left the mirroring portion out because it's svn://, not svn+ssh:// and may be different. Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Jul 14 23:33:24 2015 (r46983) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Jul 14 23:38:20 2015 (r46984) @@ -509,15 +509,15 @@ You need a Passphrase to protect your se repository. For the <literal>src</literal> tree, use:</para> - <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src</userinput></screen> <para>For the <literal>doc</literal> tree, use:</para> - <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/doc/head /usr/doc</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout svn+ssh://repo.freebsd.org/doc/head /usr/doc</userinput></screen> <para>For the <literal>ports</literal> tree, use:</para> - <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/ports/head /usr/ports</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout svn+ssh://repo.freebsd.org/ports/head /usr/ports</userinput></screen> <note> <para>Though the remaining examples in this document are @@ -541,18 +541,18 @@ You need a Passphrase to protect your se <para><literal>svn+ssh</literal> means the <acronym>SVN</acronym> protocol tunnelled over <acronym>SSH</acronym>. The name of the server is - <literal>svn.freebsd.org</literal>, <literal>base</literal> + <literal>repo.freebsd.org</literal>, <literal>base</literal> is the path to the repository, and <literal>head</literal> is the subdirectory within the repository.</para> <para>If your &os; login name is different from your login name on your local machine, you must either include it in the <acronym>URL</acronym> (for example - <literal>svn+ssh://[email protected]/base/head</literal>), + <literal>svn+ssh://[email protected]/base/head</literal>), or add an entry to your <filename>~/.ssh/config</filename> in the form:</para> - <programlisting>Host svn.freebsd.org + <programlisting>Host repo.freebsd.org User jarjar</programlisting> <para>This is the simplest method, but it is hard to tell just @@ -572,7 +572,7 @@ You need a Passphrase to protect your se <para>Check out a working copy from a mirror by substituting the mirror's <acronym>URL</acronym> for - <literal>svn+ssh://svn.freebsd.org/base</literal>. This can + <literal>svn+ssh://repo.freebsd.org/base</literal>. This can be an official mirror or a mirror maintained by using <command>svnsync</command>.</para> @@ -597,7 +597,7 @@ You need a Passphrase to protect your se <title><literal>RELENG_*</literal> Branches and General Layout</title> - <para>In <literal>svn+ssh://svn.freebsd.org/base</literal>, + <para>In <literal>svn+ssh://repo.freebsd.org/base</literal>, <emphasis>base</emphasis> refers to the source tree. Similarly, <emphasis>ports</emphasis> refers to the ports tree, and so on. These are separate repositories with their @@ -657,7 +657,7 @@ You need a Passphrase to protect your se <title>&os; Documentation Project Branches and Layout</title> - <para>In <literal>svn+ssh://svn.freebsd.org/doc</literal>, + <para>In <literal>svn+ssh://repo.freebsd.org/doc</literal>, <emphasis>doc</emphasis> refers to the repository root of the source tree.</para> @@ -697,7 +697,7 @@ You need a Passphrase to protect your se <sect3 xml:id="svn-getting-started-ports-layout"> <title>&os; Ports Tree Branches and Layout</title> - <para>In <literal>svn+ssh://svn.freebsd.org/ports</literal>, + <para>In <literal>svn+ssh://repo.freebsd.org/ports</literal>, <emphasis>ports</emphasis> refers to the repository root of the ports tree.</para> @@ -756,7 +756,7 @@ You need a Passphrase to protect your se <para>As seen earlier, to check out the &os; head branch:</para> - <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src</userinput></screen> <para>At some point, more than just <literal>HEAD</literal> will probably be useful, for instance when merging changes @@ -767,7 +767,7 @@ You need a Passphrase to protect your se <para>To do this, first check out the root of the repository:</para> - <screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base</userinput></screen> + <screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base</userinput></screen> <para>This will give <literal>base</literal> with all the files it contains (at the time of writing, just @@ -1156,13 +1156,13 @@ You need a Passphrase to protect your se <para>Branching is very fast. The following command would be used to branch <literal>RELENG_8</literal>:</para> - <screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8</userinput></screen> + <screen>&prompt.user; <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/stable/8</userinput></screen> <para>This is equivalent to the following set of commands which take minutes and hours as opposed to seconds, depending on your network connection:</para> - <screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base</userinput> + <screen>&prompt.user; <userinput>svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base</userinput> &prompt.user; <userinput>cd base</userinput> &prompt.user; <userinput>svn update --set-depth=infinity head</userinput> &prompt.user; <userinput>svn copy head stable/8</userinput> @@ -1178,7 +1178,7 @@ You need a Passphrase to protect your se <note> <para>In all examples below, <literal>$FSVN</literal> refers to the location of the &os; Subversion repository, - <literal>svn+ssh://svn.freebsd.org/base/</literal>.</para> + <literal>svn+ssh://repo.freebsd.org/base/</literal>.</para> </note> <sect4> @@ -1467,7 +1467,7 @@ You need a Passphrase to protect your se <listitem> <para>$FSVN is - <literal>svn+ssh://svn.freebsd.org/base</literal></para> + <literal>svn+ssh://repo.freebsd.org/base</literal></para> </listitem> </itemizedlist> @@ -1520,7 +1520,7 @@ $target - head/$source:$P,$Q,$R</screen> <para>Take a quick note of how it looks before moving on to the next step; doing the actual merge:</para> - <screen>&prompt.user; <userinput>svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4</userinput> + <screen>&prompt.user; <userinput>svn merge -c r238987 svn+ssh://repo.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4</userinput> --- Merging r238987 into 'stable/9/share/man/man4': U stable/9/share/man/man4/netmap.4 --- Recording mergeinfo for merge of r238987 into @@ -1703,7 +1703,7 @@ U stable/9/share/man/man4/netmap.4 vendor tree, prior to importing new sources:</para> <screen>&prompt.user; <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput> -&prompt.user; <userinput>svn merge --record-only svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist@180876</replaceable> .</userinput> +&prompt.user; <userinput>svn merge --record-only svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist@180876</replaceable> .</userinput> &prompt.user; <userinput>svn commit</userinput></screen> </sect5> </sect4> @@ -1789,7 +1789,7 @@ U stable/9/share/man/man4/netmap.4 future reference. The best and quickest way to do this is directly in the repository:</para> - <screen>&prompt.user; <userinput>svn cp svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/4.3</replaceable></userinput></screen> + <screen>&prompt.user; <userinput>svn cp svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/4.3</replaceable></userinput></screen> <para>Once that is complete, <command>svn up</command> the working copy of @@ -1812,7 +1812,7 @@ U stable/9/share/man/man4/netmap.4 <screen>&prompt.user; <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput> &prompt.user; <userinput>svn up</userinput> -&prompt.user; <userinput>svn merge --accept=postpone svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> .</userinput></screen> +&prompt.user; <userinput>svn merge --accept=postpone svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> .</userinput></screen> <para>The <literal>--accept=postpone</literal> tells Subversion that it should not complain because merge @@ -1833,7 +1833,7 @@ U stable/9/share/man/man4/netmap.4 indicate the revision to merge from the <filename>/vendor</filename> tree. For example:</para> - <screen>&prompt.user; <userinput>svn checkout svn+ssh://svn.freebsd.org/base/head/contrib/<replaceable>sendmail</replaceable></userinput> + <screen>&prompt.user; <userinput>svn checkout svn+ssh://repo.freebsd.org/base/head/contrib/<replaceable>sendmail</replaceable></userinput> &prompt.user; <userinput>cd sendmail</userinput> &prompt.user; <userinput>svn merge -c r<replaceable>261190</replaceable> ^/vendor/<replaceable>sendmail/dist</replaceable> .</userinput></screen> @@ -1856,7 +1856,7 @@ U stable/9/share/man/man4/netmap.4 main tree. To check diffs against the vendor branch:</para> - <screen>&prompt.user; <userinput>svn diff --no-diff-deleted --old=svn+ssh://svn.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> --new=.</userinput></screen> + <screen>&prompt.user; <userinput>svn diff --no-diff-deleted --old=svn+ssh://repo.freebsd.org/base/<replaceable>vendor/pf/dist</replaceable> --new=.</userinput></screen> <para>The <literal>--no-diff-deleted</literal> tells Subversion not to complain about files that are in the @@ -1947,7 +1947,7 @@ U stable/9/share/man/man4/netmap.4 <para>This can also be done directly in the repository:</para> - <screen>&prompt.user; <userinput>svn merge -r179454:179453 svn+ssh://svn.freebsd.org/base/ROADMAP.txt</userinput></screen> + <screen>&prompt.user; <userinput>svn merge -r179454:179453 svn+ssh://repo.freebsd.org/base/ROADMAP.txt</userinput></screen> <note> <para>It is important to ensure that the mergeinfo @@ -1961,12 +1961,12 @@ U stable/9/share/man/man4/netmap.4 is required. For example, to restore a file that was deleted in revision N, restore version N-1:</para> - <screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/ROADMAP.txt@179454</userinput> + <screen>&prompt.user; <userinput>svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454</userinput> &prompt.user; <userinput>svn commit</userinput></screen> <para>or, equally:</para> - <screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://svn.freebsd.org/base</userinput></screen> + <screen>&prompt.user; <userinput>svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://repo.freebsd.org/base</userinput></screen> <para>Do <emphasis>not</emphasis> simply recreate the file manually and <command>svn add</command> it—this will @@ -2091,13 +2091,13 @@ U stable/9/share/man/man4/netmap.4 <para>To create a project branch:</para> - <screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/projects/spif</userinput></screen> + <screen>&prompt.user; <userinput>svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/projects/spif</userinput></screen> <para>To merge changes from HEAD back into the project branch:</para> <screen>&prompt.user; <userinput>cd copy_of_spif</userinput> -&prompt.user; <userinput>svn merge svn+ssh://svn.freebsd.org/base/head</userinput> +&prompt.user; <userinput>svn merge svn+ssh://repo.freebsd.org/base/head</userinput> &prompt.user; <userinput>svn commit</userinput></screen> <para>It is important to resolve any merge conflicts before @@ -4135,7 +4135,7 @@ Relnotes: yes</programlisting> port:</para> <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput> -&prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@<replaceable>XXXXXX</replaceable>' <replaceable>portname</replaceable></userinput></screen> +&prompt.user; <userinput>svn cp 'svn+ssh://repo.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@<replaceable>XXXXXX</replaceable>' <replaceable>portname</replaceable></userinput></screen> <para>Pick the revision that is just before the removal. For example, if the revision where it was @@ -4147,7 +4147,7 @@ Relnotes: yes</programlisting> after the last commit to the port.</para> <screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput> -&prompt.user; <userinput>svn cp 'svn+ssh://svn.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable></userinput></screen> +&prompt.user; <userinput>svn cp 'svn+ssh://repo.freebsd.org/ports/head/<replaceable>category</replaceable>/<replaceable>portname</replaceable>/@{<replaceable>YYYY-MM-DD</replaceable>}' <replaceable>portname</replaceable></userinput></screen> </step> <step> @@ -4754,7 +4754,7 @@ Do you want to commit? (no = start a she account, you need a few lines in your <filename>~/.ssh/config</filename>:</para> - <programlisting>Host svn.freebsd.org # Can be *.freebsd.org + <programlisting>Host repo.freebsd.org # Can be *.freebsd.org User <replaceable>freebsd-login</replaceable></programlisting> </answer> </qandaentry> _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-doc-all To unsubscribe, send any mail to "[email protected]"