Whitespace-only fixes. Translators, please ignore.
This commit is contained in:
Warren Block
parent
8ce29fd673
commit
25f2fded6c
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=42101
1 changed files with 89 additions and 85 deletions
|
|
@ -85,7 +85,8 @@
|
|||
Root</emphasis></entry>
|
||||
<entry><literal>svn+ssh://</literal><hostid
|
||||
role="fqdn">svn.FreeBSD.org</hostid><filename>/base</filename>
|
||||
(see also <xref linkend="svn-getting-started-base-layout"/>).</entry>
|
||||
(see also <xref
|
||||
linkend="svn-getting-started-base-layout"/>).</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
|
|
@ -93,7 +94,8 @@
|
|||
Root</emphasis></entry>
|
||||
<entry><literal>svn+ssh://</literal><hostid
|
||||
role="fqdn">svn.FreeBSD.org</hostid><filename>/doc</filename>
|
||||
(see also <xref linkend="svn-getting-started-doc-layout"/>).</entry>
|
||||
(see also <xref
|
||||
linkend="svn-getting-started-doc-layout"/>).</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
|
|
@ -101,12 +103,12 @@
|
|||
Root</emphasis></entry>
|
||||
<entry><literal>svn+ssh://</literal><hostid
|
||||
role="fqdn">svn.FreeBSD.org</hostid><filename>/ports</filename>
|
||||
(see also <xref linkend="svn-getting-started-ports-layout"/>).</entry>
|
||||
(see also <xref
|
||||
linkend="svn-getting-started-ports-layout"/>).</entry>
|
||||
</row>
|
||||
|
||||
<row>
|
||||
<entry><emphasis>Internal Mailing Lists</emphasis></entry>
|
||||
|
||||
<entry>developers (technically called all-developers),
|
||||
doc-developers, doc-committers, ports-developers,
|
||||
ports-committers, src-developers, src-committers. (Each
|
||||
|
|
@ -467,12 +469,13 @@
|
|||
|
||||
<para>There is a serious disadvantage to this method: every
|
||||
time something is to be committed, a
|
||||
<command>svn relocate</command> to the master repository has to be
|
||||
done, remembering to <command>svn relocate</command> back to
|
||||
the mirror after the commit. Also, since <command>svn
|
||||
relocate</command> only works between repositories that have
|
||||
the same UUID, some hacking of the local repository's UUID
|
||||
has to occur before it is possible to start using it.</para>
|
||||
<command>svn relocate</command> to the master repository has
|
||||
to be done, remembering to <command>svn relocate</command>
|
||||
back to the mirror after the commit. Also, since
|
||||
<command>svn relocate</command> only works between
|
||||
repositories that have the same UUID, some hacking of the
|
||||
local repository's UUID has to occur before it is possible
|
||||
to start using it.</para>
|
||||
|
||||
<para>Unlike with <acronym>CVS</acronym>,
|
||||
the hassle of a local
|
||||
|
|
@ -629,9 +632,8 @@
|
|||
<sect3 id="svn-daily-use-help">
|
||||
<title>Help</title>
|
||||
|
||||
<para><acronym>SVN</acronym>
|
||||
has built in help documentation. It can be accessed by
|
||||
typing the following command:</para>
|
||||
<para><acronym>SVN</acronym> has built in help documentation.
|
||||
It can be accessed by typing the following command:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>svn help</userinput></screen>
|
||||
|
||||
|
|
@ -746,9 +748,8 @@
|
|||
<sect3 id="svn-daily-use-editing-and-committing">
|
||||
<title>Editing and Committing</title>
|
||||
|
||||
<para>Unlike Perforce,
|
||||
<acronym>SVN</acronym> does not
|
||||
need to be told in advance about file editing.</para>
|
||||
<para>Unlike Perforce, <acronym>SVN</acronym> does not need to
|
||||
be told in advance about file editing.</para>
|
||||
|
||||
<para><command>svn commit</command> works like the equivalent
|
||||
<acronym>CVS</acronym> command. To commit all changes in
|
||||
|
|
@ -764,8 +765,8 @@
|
|||
|
||||
<screen>&prompt.user; <userinput>svn commit <replaceable>lib/libfetch</replaceable> <replaceable>usr/bin/fetch</replaceable></userinput></screen>
|
||||
|
||||
<para>There is also a commit wrapper for the ports tree
|
||||
to handle the properties and sanity checking your
|
||||
<para>There is also a commit wrapper for the ports tree to
|
||||
handle the properties and sanity checking your
|
||||
changes:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>/usr/ports/Tools/scripts/psvn commit
|
||||
|
|
@ -814,19 +815,19 @@
|
|||
|
||||
<screen>&prompt.user; <userinput>svn remove <replaceable>foo</replaceable></userinput></screen>
|
||||
|
||||
<para>Subversion does not require deleting the
|
||||
file before using <command>svn rm</command>, and indeed
|
||||
complains if that happens.</para>
|
||||
<para>Subversion does not require deleting the file before
|
||||
using <command>svn rm</command>, and indeed complains if
|
||||
that happens.</para>
|
||||
|
||||
<para>It is possible to add directories with <command>svn
|
||||
add</command>:</para>
|
||||
<para>It is possible to add directories with
|
||||
<command>svn add</command>:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>mkdir <replaceable>bar</replaceable></userinput>
|
||||
&prompt.user; <userinput>svn add <replaceable>bar</replaceable></userinput></screen>
|
||||
|
||||
<para>Although <command>svn mkdir</command> makes this
|
||||
easier by combining the creation of the directory and the
|
||||
adding of it:</para>
|
||||
<para>Although <command>svn mkdir</command> makes this easier
|
||||
by combining the creation of the directory and the adding of
|
||||
it:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
|
||||
|
||||
|
|
@ -841,8 +842,8 @@
|
|||
<title>Copying and Moving Files</title>
|
||||
|
||||
<para>This command creates a copy of
|
||||
<filename>foo.c</filename> named
|
||||
<filename>bar.c</filename>, with the new file also under version control:</para>
|
||||
<filename>foo.c</filename> named <filename>bar.c</filename>,
|
||||
with the new file also under version control:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput></screen>
|
||||
|
||||
|
|
@ -859,10 +860,10 @@
|
|||
<sect3 id="svn-daily-use-log-and-annotate">
|
||||
<title>Log and Annotate</title>
|
||||
|
||||
<para><command>svn log</command> shows revisions and
|
||||
commit messages, most recent first, for files or directories. When used on a directory, all
|
||||
revisions that affected the directory and files within that
|
||||
directory are shown.</para>
|
||||
<para><command>svn log</command> shows revisions and commit
|
||||
messages, most recent first, for files or directories. When
|
||||
used on a directory, all revisions that affected the
|
||||
directory and files within that directory are shown.</para>
|
||||
|
||||
<para><command>svn annotate</command>, or equally <command>svn
|
||||
praise</command> or <command>svn blame</command>, shows
|
||||
|
|
@ -874,14 +875,12 @@
|
|||
<title>Diffs</title>
|
||||
|
||||
<para><command>svn diff</command> displays changes to the
|
||||
working copy. Diffs generated by
|
||||
<acronym>SVN</acronym> are unified
|
||||
and include new files by default
|
||||
in the diff output.</para>
|
||||
working copy. Diffs generated by <acronym>SVN</acronym> are
|
||||
unified and include new files by default in the diff
|
||||
output.</para>
|
||||
|
||||
<para><command>svn
|
||||
diff</command> can show the changes between two revisions
|
||||
of the same file:</para>
|
||||
<para><command>svn diff</command> can show the changes between
|
||||
two revisions of the same file:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>svn diff -r179453:179454 ROADMAP.txt</userinput></screen>
|
||||
|
||||
|
|
@ -897,10 +896,9 @@
|
|||
<title>Reverting</title>
|
||||
|
||||
<para>Local changes (including additions and deletions) can be
|
||||
reverted using <command>svn revert</command>.
|
||||
It does not update out-of-date
|
||||
files, but just replaces them with pristine copies of
|
||||
the original version.</para>
|
||||
reverted using <command>svn revert</command>. It does not
|
||||
update out-of-date files, but just replaces them with
|
||||
pristine copies of the original version.</para>
|
||||
</sect3>
|
||||
|
||||
<sect3 id="svn-daily-use-conflicts">
|
||||
|
|
@ -945,8 +943,9 @@
|
|||
|
||||
<listitem>
|
||||
<para><literal>theirs-full</literal>: use the version that
|
||||
was retrieved when you did <command>svn
|
||||
update</command>, discarding your own changes.</para>
|
||||
was retrieved when you did
|
||||
<command>svn update</command>, discarding your own
|
||||
changes.</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</sect3>
|
||||
|
|
@ -982,6 +981,7 @@
|
|||
files and directories it contains, but none of the
|
||||
subdirectories' contents.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para><literal>infinity</literal>: anything.</para>
|
||||
</listitem>
|
||||
|
|
@ -1006,8 +1006,9 @@
|
|||
<filename>ROADMAP.txt</filename> and empty subdirectories,
|
||||
and nothing will happen when <command>svn update</command>
|
||||
is executed on the subdirectories. However, the following
|
||||
command will set the depth for <replaceable>head</replaceable> (in this case) to
|
||||
infinity, and fully populate it:</para>
|
||||
command will set the depth for
|
||||
<replaceable>head</replaceable> (in this case) to infinity,
|
||||
and fully populate it:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>svn update --set-depth=infinity <replaceable>head</replaceable></userinput></screen>
|
||||
</sect3>
|
||||
|
|
@ -1016,9 +1017,9 @@
|
|||
<title>Direct Operation</title>
|
||||
|
||||
<para>Certain operations can be performed directly on the
|
||||
repository without touching the working copy.
|
||||
Specifically, this applies to any operation that does not
|
||||
require editing a file, including:</para>
|
||||
repository without touching the working copy. Specifically,
|
||||
this applies to any operation that does not require editing
|
||||
a file, including:</para>
|
||||
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
|
|
@ -1051,8 +1052,8 @@
|
|||
|
||||
<screen>&prompt.user; <userinput>svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.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,
|
||||
<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>
|
||||
|
|
@ -1089,15 +1090,15 @@
|
|||
|
||||
<para>It is <emphasis>not</emphasis> inherited. For
|
||||
instance, <filename
|
||||
class="directory">stable/6/contrib/openpam/</filename>
|
||||
does not implicitly inherit mergeinfo from <filename
|
||||
class="directory">stable/6/</filename>, or <filename
|
||||
class="directory">stable/6/contrib/</filename>. Doing
|
||||
so would make partial checkouts very hard to manage.
|
||||
class="directory">stable/6/contrib/openpam/</filename>
|
||||
does not implicitly inherit mergeinfo from
|
||||
<filename class="directory">stable/6/</filename>, or
|
||||
<filename class="directory">stable/6/contrib/</filename>.
|
||||
Doing so would make partial checkouts very hard to manage.
|
||||
Instead, mergeinfo is explicitly propagated down the tree.
|
||||
For merging something into <filename
|
||||
class="directory">branch/foo/bar/</filename>, the
|
||||
following rules apply:</para>
|
||||
For merging something into
|
||||
<filename class="directory">branch/foo/bar/</filename>,
|
||||
the following rules apply:</para>
|
||||
|
||||
<orderedlist>
|
||||
<listitem>
|
||||
|
|
@ -1119,9 +1120,9 @@
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>If a direct descendant of <filename
|
||||
class="directory">branch/foo/bar/</filename> (for
|
||||
instance, <filename
|
||||
<para>If a direct descendant of
|
||||
<filename class="directory">branch/foo/bar/</filename>
|
||||
(for instance, <filename
|
||||
class="directory">branch/foo/bar/baz/</filename>)
|
||||
already has a mergeinfo record, information about the
|
||||
current merge will be propagated down to it.</para>
|
||||
|
|
@ -1170,9 +1171,10 @@
|
|||
<para>Changes to kernel code should be merged to
|
||||
<filename class="directory">sys/</filename>. For
|
||||
instance, a change to the &man.ichwd.4; driver should
|
||||
be merged to <filename
|
||||
class="directory">sys/</filename>, not <filename
|
||||
class="directory">sys/dev/ichwd/</filename>.
|
||||
be merged to
|
||||
|
||||
<filename class="directory">sys/</filename>, not
|
||||
<filename class="directory">sys/dev/ichwd/</filename>.
|
||||
Likewise, a change to the TCP/IP stack should be
|
||||
merged to <filename class="directory">sys/</filename>,
|
||||
not <filename
|
||||
|
|
@ -1180,18 +1182,19 @@
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Changes to code under <filename
|
||||
class="directory">etc/</filename> should be merged
|
||||
at <filename class="directory">etc/</filename>, not
|
||||
below it.</para>
|
||||
<para>Changes to code under
|
||||
<filename class="directory">etc/</filename> should be
|
||||
merged at <filename class="directory">etc/</filename>,
|
||||
not below it.</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Changes to vendor code (code in <filename
|
||||
class="directory">contrib/</filename>, <filename
|
||||
class="directory">crypto/</filename> and so on)
|
||||
should be merged to the directory where vendor imports
|
||||
happen. For instance, a change to <filename
|
||||
<para>Changes to vendor code (code in
|
||||
|
||||
<filename class="directory">contrib/</filename>,
|
||||
<filename class="directory">crypto/</filename> and so
|
||||
on) should be merged to the directory where vendor
|
||||
imports happen. For instance, a change to <filename
|
||||
class="directory">crypto/openssl/util/</filename>
|
||||
should be merged to <filename
|
||||
class="directory">crypto/openssl/</filename>. This
|
||||
|
|
@ -1237,11 +1240,12 @@
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>Other changes to <filename
|
||||
class="directory">share/</filename> should be merged
|
||||
to the appropriate subdirectory and not to
|
||||
<para>Other changes to
|
||||
<filename class="directory">share/</filename> should
|
||||
be merged to the appropriate subdirectory and not to
|
||||
<filename class="directory">share/</filename>
|
||||
directly.</para>
|
||||
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
|
|
@ -1382,8 +1386,8 @@ $target - head/$source:$P,$Q,$R</screen>
|
|||
this is also where to do the merge. Note that in this
|
||||
example all paths are relative to the top of the svn
|
||||
repository. For more information on the directory
|
||||
layout, see
|
||||
<xref linkend="svn-getting-started-base-layout"/>.</para>
|
||||
layout, see <xref
|
||||
linkend="svn-getting-started-base-layout"/>.</para>
|
||||
|
||||
<para>The first step is to inspect the existing
|
||||
mergeinfo.</para>
|
||||
|
|
@ -2027,11 +2031,11 @@ ControlPersist yes</screen>
|
|||
<command>svn:keywords</command> property will be
|
||||
rejected when attempting to commit them to the
|
||||
repository. Be sure to read
|
||||
<xref linkend="svn-daily-use-adding-and-removing"/> regarding
|
||||
adding and removing files, in addition to verifying that
|
||||
<filename>~/.subversion/config</filename> contains the
|
||||
necessary "auto-props" entries from
|
||||
<filename>auto-props.txt</filename> mentioned
|
||||
<xref linkend="svn-daily-use-adding-and-removing"/>
|
||||
regarding adding and removing files, in addition to
|
||||
verifying that <filename>~/.subversion/config</filename>
|
||||
contains the necessary "auto-props" entries
|
||||
from <filename>auto-props.txt</filename> mentioned
|
||||
there.</para>
|
||||
</important>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue