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

s/svn.freebsd.org/repo.freebsd.org/ when appropriate. I have left the

Browse source 
mirroring portion out because it's svn://, not svn+ssh:// and may be
different.
This commit is contained in:
Xin LI 2015-07-14 23:38:20 +00:00
parent e1d89928bc
commit 2bed4d5006
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=46984
1 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
en_US.ISO8859-1/articles/committers-guide/article.xml
View file

@ -509,15 +509,15 @@ You need a Passphrase to protect your secret key.</screen>
repository. For the <literal>src</literal> tree, repository. For the <literal>src</literal> tree,
use:</para> 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> <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> <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> <note>
<para>Though the remaining examples in this document are <para>Though the remaining examples in this document are
@ -541,18 +541,18 @@ You need a Passphrase to protect your secret key.</screen>
<para><literal>svn+ssh</literal> means the <para><literal>svn+ssh</literal> means the
<acronym>SVN</acronym> protocol tunnelled over <acronym>SVN</acronym> protocol tunnelled over
<acronym>SSH</acronym>. The name of the server is <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 path to the repository, and <literal>head</literal>
is the subdirectory within the repository.</para> is the subdirectory within the repository.</para>
<para>If your &os; login name is different from your login <para>If your &os; login name is different from your login
name on your local machine, you must either include it in name on your local machine, you must either include it in
the <acronym>URL</acronym> (for example the <acronym>URL</acronym> (for example
<literal>svn+ssh://jarjar@svn.freebsd.org/base/head</literal>), <literal>svn+ssh://jarjar@repo.freebsd.org/base/head</literal>),
or add an entry to your <filename>~/.ssh/config</filename> or add an entry to your <filename>~/.ssh/config</filename>
in the form:</para> in the form:</para>
<programlisting>Host svn.freebsd.org <programlisting>Host repo.freebsd.org
User jarjar</programlisting> User jarjar</programlisting>
<para>This is the simplest method, but it is hard to tell just <para>This is the simplest method, but it is hard to tell just
@ -572,7 +572,7 @@ You need a Passphrase to protect your secret key.</screen>
<para>Check out a working copy from a mirror by <para>Check out a working copy from a mirror by
substituting the mirror's <acronym>URL</acronym> for 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 be an official mirror or a mirror maintained by
using <command>svnsync</command>.</para> using <command>svnsync</command>.</para>
@ -597,7 +597,7 @@ You need a Passphrase to protect your secret key.</screen>
<title><literal>RELENG_*</literal> Branches and General <title><literal>RELENG_*</literal> Branches and General
Layout</title> 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. <emphasis>base</emphasis> refers to the source tree.
Similarly, <emphasis>ports</emphasis> refers to the ports Similarly, <emphasis>ports</emphasis> refers to the ports
tree, and so on. These are separate repositories with their tree, and so on. These are separate repositories with their
@ -657,7 +657,7 @@ You need a Passphrase to protect your secret key.</screen>
<title>&os; Documentation Project Branches and <title>&os; Documentation Project Branches and
Layout</title> 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 <emphasis>doc</emphasis> refers to the repository root of
the source tree.</para> the source tree.</para>
@ -697,7 +697,7 @@ You need a Passphrase to protect your secret key.</screen>
<sect3 xml:id="svn-getting-started-ports-layout"> <sect3 xml:id="svn-getting-started-ports-layout">
<title>&os; Ports Tree Branches and Layout</title> <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 <emphasis>ports</emphasis> refers to the repository root of
the ports tree.</para> the ports tree.</para>
@ -756,7 +756,7 @@ You need a Passphrase to protect your secret key.</screen>
<para>As seen earlier, to check out the &os; head <para>As seen earlier, to check out the &os; head
branch:</para> 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> <para>At some point, more than just <literal>HEAD</literal>
will probably be useful, for instance when merging changes will probably be useful, for instance when merging changes
@ -767,7 +767,7 @@ You need a Passphrase to protect your secret key.</screen>
<para>To do this, first check out the root of the <para>To do this, first check out the root of the
repository:</para> 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 <para>This will give <literal>base</literal> with all the
files it contains (at the time of writing, just files it contains (at the time of writing, just
@ -1156,13 +1156,13 @@ You need a Passphrase to protect your secret key.</screen>
<para>Branching is very fast. The following command would be <para>Branching is very fast. The following command would be
used to branch <literal>RELENG_8</literal>:</para> 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 <para>This is equivalent to the following set of commands
which take minutes and hours as opposed to seconds, which take minutes and hours as opposed to seconds,
depending on your network connection:</para> 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>cd base</userinput>
&prompt.user; <userinput>svn update --set-depth=infinity head</userinput> &prompt.user; <userinput>svn update --set-depth=infinity head</userinput>
&prompt.user; <userinput>svn copy head stable/8</userinput> &prompt.user; <userinput>svn copy head stable/8</userinput>
@ -1178,7 +1178,7 @@ You need a Passphrase to protect your secret key.</screen>
<note> <note>
<para>In all examples below, <literal>&dollar;FSVN</literal> <para>In all examples below, <literal>&dollar;FSVN</literal>
refers to the location of the &os; Subversion repository, 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> </note>
<sect4> <sect4>
@ -1467,7 +1467,7 @@ You need a Passphrase to protect your secret key.</screen>
<listitem> <listitem>
<para>&dollar;FSVN is <para>&dollar;FSVN is
<literal>svn+ssh://svn.freebsd.org/base</literal></para> <literal>svn+ssh://repo.freebsd.org/base</literal></para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -1520,7 +1520,7 @@ $target - head/$source:$P,$Q,$R</screen>
<para>Take a quick note of how it looks before moving on <para>Take a quick note of how it looks before moving on
to the next step; doing the actual merge:</para> 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': --- Merging r238987 into 'stable/9/share/man/man4':
U stable/9/share/man/man4/netmap.4 U stable/9/share/man/man4/netmap.4
--- Recording mergeinfo for merge of r238987 into --- 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> vendor tree, prior to importing new sources:</para>
<screen>&prompt.user; <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput> <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> &prompt.user; <userinput>svn commit</userinput></screen>
</sect5> </sect5>
</sect4> </sect4>
@ -1789,7 +1789,7 @@ U stable/9/share/man/man4/netmap.4
future reference. The best and quickest way to do this future reference. The best and quickest way to do this
is directly in the repository:</para> 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 <para>Once that is complete, <command>svn up</command> the
working copy of 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> <screen>&prompt.user; <userinput>cd <replaceable>head/contrib/pf</replaceable></userinput>
&prompt.user; <userinput>svn up</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 <para>The <literal>--accept=postpone</literal> tells
Subversion that it should not complain because merge 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 indicate the revision to merge from the
<filename>/vendor</filename> tree. For example:</para> <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>cd sendmail</userinput>
&prompt.user; <userinput>svn merge -c r<replaceable>261190</replaceable> ^/vendor/<replaceable>sendmail/dist</replaceable> .</userinput></screen> &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 main tree. To check diffs against the vendor
branch:</para> 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 <para>The <literal>--no-diff-deleted</literal> tells
Subversion not to complain about files that are in the 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> <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> <note>
<para>It is important to ensure that the mergeinfo <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 is required. For example, to restore a file that was
deleted in revision N, restore version N-1:</para> 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> &prompt.user; <userinput>svn commit</userinput></screen>
<para>or, equally:</para> <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 <para>Do <emphasis>not</emphasis> simply recreate the file
manually and <command>svn add</command> it&mdash;this will manually and <command>svn add</command> it&mdash;this will
@ -2091,13 +2091,13 @@ U stable/9/share/man/man4/netmap.4
<para>To create a project branch:</para> <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 <para>To merge changes from HEAD back into the project
branch:</para> branch:</para>
<screen>&prompt.user; <userinput>cd copy_of_spif</userinput> <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> &prompt.user; <userinput>svn commit</userinput></screen>
<para>It is important to resolve any merge conflicts before <para>It is important to resolve any merge conflicts before
@ -4135,7 +4135,7 @@ Relnotes: yes</programlisting>
port:</para> port:</para>
<screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput> <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 <para>Pick the revision that is just before the
removal. For example, if the revision where it was removal. For example, if the revision where it was
@ -4147,7 +4147,7 @@ Relnotes: yes</programlisting>
after the last commit to the port.</para> after the last commit to the port.</para>
<screen>&prompt.user; <userinput>cd /usr/ports/<replaceable>category</replaceable></userinput> <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>
<step> <step>
@ -4754,7 +4754,7 @@ Do you want to commit? (no = start a shell) [y/n]</screen>
account, you need a few lines in your account, you need a few lines in your
<filename>~/.ssh/config</filename>:</para> <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> User <replaceable>freebsd-login</replaceable></programlisting>
</answer> </answer>
</qandaentry> </qandaentry>