Reduce the presence of CVS in the committers guide. Comparisons with CVS
are not needed anymore. Approved by: bcr
This commit is contained in:
parent
025275ff35
commit
52ebc2de70
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=39641
1 changed files with 14 additions and 32 deletions
|
@ -478,7 +478,7 @@
|
||||||
other repositories, and keeping local branches for merging
|
other repositories, and keeping local branches for merging
|
||||||
back into the upstream repositories. There are extensions
|
back into the upstream repositories. There are extensions
|
||||||
that allow <acronym>SVK</acronym> to mirror
|
that allow <acronym>SVK</acronym> to mirror
|
||||||
<acronym>CVS</acronym> and Perforce repositories in addition
|
Perforce repositories in addition
|
||||||
to Subversion ones.</para>
|
to Subversion ones.</para>
|
||||||
|
|
||||||
<para>Like everything, <acronym>SVK</acronym> has its
|
<para>Like everything, <acronym>SVK</acronym> has its
|
||||||
|
@ -711,16 +711,6 @@
|
||||||
daily use, except for the revision renumbering mentioned
|
daily use, except for the revision renumbering mentioned
|
||||||
earlier.</para>
|
earlier.</para>
|
||||||
|
|
||||||
<note>
|
|
||||||
<para><acronym>SVN</acronym> and <acronym>SVK</acronym>
|
|
||||||
commands that have direct <acronym>CVS</acronym> equivalents
|
|
||||||
usually have the same name and abbreviations. For example:
|
|
||||||
<emphasis>checkout</emphasis> and <emphasis>co</emphasis>,
|
|
||||||
<emphasis>update</emphasis> and <emphasis>up</emphasis>, and
|
|
||||||
<emphasis>commit</emphasis> and
|
|
||||||
<emphasis>ci</emphasis>.</para>
|
|
||||||
</note>
|
|
||||||
|
|
||||||
<sect3>
|
<sect3>
|
||||||
<title>Help</title>
|
<title>Help</title>
|
||||||
|
|
||||||
|
@ -824,11 +814,7 @@
|
||||||
|
|
||||||
<screen>&prompt.user; <userinput>svn status</userinput></screen>
|
<screen>&prompt.user; <userinput>svn status</userinput></screen>
|
||||||
|
|
||||||
<para><acronym>CVS</acronym> has no direct equivalent of this
|
<para>To show local changes and files that are out-of-date do:</para>
|
||||||
command. The nearest would be <command>cvs up -N</command>
|
|
||||||
which shows local changes and files that are out-of-date.
|
|
||||||
Doing this in <acronym>SVN</acronym> is possible too,
|
|
||||||
however:</para>
|
|
||||||
|
|
||||||
<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
|
<screen>&prompt.user; <userinput>svn status --show-updates</userinput></screen>
|
||||||
</sect3>
|
</sect3>
|
||||||
|
@ -836,7 +822,7 @@
|
||||||
<sect3>
|
<sect3>
|
||||||
<title>Editing and Committing</title>
|
<title>Editing and Committing</title>
|
||||||
|
|
||||||
<para>Like <acronym>CVS</acronym> but unlike Perforce,
|
<para>Unlike Perforce,
|
||||||
<acronym>SVN</acronym> and <acronym>SVK</acronym> do not
|
<acronym>SVN</acronym> and <acronym>SVK</acronym> do not
|
||||||
need to be told in advance about file editing.</para>
|
need to be told in advance about file editing.</para>
|
||||||
|
|
||||||
|
@ -882,7 +868,7 @@
|
||||||
</para>
|
</para>
|
||||||
</note>
|
</note>
|
||||||
|
|
||||||
<para>As with <acronym>CVS</acronym>, files are added to a
|
<para>Files are added to a
|
||||||
<acronym>SVN</acronym> repository with <command>svn
|
<acronym>SVN</acronym> repository with <command>svn
|
||||||
add</command>. To add a file named
|
add</command>. To add a file named
|
||||||
<emphasis>foo</emphasis>, edit it, then:</para>
|
<emphasis>foo</emphasis>, edit it, then:</para>
|
||||||
|
@ -910,10 +896,9 @@
|
||||||
|
|
||||||
<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
|
<screen>&prompt.user; <userinput>svn mkdir <replaceable>bar</replaceable></userinput></screen>
|
||||||
|
|
||||||
<para>In <acronym>CVS</acronym>, the directory is immediately
|
<para>The directory is not immediately
|
||||||
created in the repository when you <command>cvs
|
created in the repository when you use <command>svn
|
||||||
add</command> it; this is not the case in Subversion.
|
mkdir</command>. Subversion
|
||||||
Furthermore, unlike <acronym>CVS</acronym>, Subversion
|
|
||||||
allows directories to be removed using <command>svn
|
allows directories to be removed using <command>svn
|
||||||
rm</command>, however there is no <command>svn
|
rm</command>, however there is no <command>svn
|
||||||
rmdir</command>:</para>
|
rmdir</command>:</para>
|
||||||
|
@ -938,9 +923,6 @@
|
||||||
|
|
||||||
<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>
|
<screen>&prompt.user; <userinput>svn copy <replaceable>foo.c</replaceable> <replaceable>bar.c</replaceable></userinput>
|
||||||
&prompt.user; <userinput>svn remove <replaceable>foo.c</replaceable></userinput></screen>
|
&prompt.user; <userinput>svn remove <replaceable>foo.c</replaceable></userinput></screen>
|
||||||
|
|
||||||
<para>Neither of these operations have equivalents in
|
|
||||||
<acronym>CVS</acronym>.</para>
|
|
||||||
</sect3>
|
</sect3>
|
||||||
|
|
||||||
<sect3>
|
<sect3>
|
||||||
|
@ -965,11 +947,11 @@
|
||||||
|
|
||||||
<para><command>svn diff</command> displays changes to the
|
<para><command>svn diff</command> displays changes to the
|
||||||
working copy of the repository. Diffs generated by
|
working copy of the repository. Diffs generated by
|
||||||
<acronym>SVN</acronym> are unified by default, unlike
|
<acronym>SVN</acronym> are unified
|
||||||
<acronym>CVS</acronym>, and include new files by default
|
and include new files by default
|
||||||
in the diff output.</para>
|
in the diff output.</para>
|
||||||
|
|
||||||
<para>As with <acronym>CVS</acronym>, <command>svn
|
<para><command>svn
|
||||||
diff</command> can show the changes between two revisions
|
diff</command> can show the changes between two revisions
|
||||||
of the same file:</para>
|
of the same file:</para>
|
||||||
|
|
||||||
|
@ -987,8 +969,8 @@
|
||||||
<title>Reverting</title>
|
<title>Reverting</title>
|
||||||
|
|
||||||
<para>Local changes (including additions and deletions) can be
|
<para>Local changes (including additions and deletions) can be
|
||||||
reverted using <command>svn revert</command>. Unlike
|
reverted using <command>svn revert</command>.
|
||||||
<command>cvs up -C</command>, it does not update out-of-date
|
It does not update out-of-date
|
||||||
files—it just replaces them with pristine copies of
|
files—it just replaces them with pristine copies of
|
||||||
the original version.</para>
|
the original version.</para>
|
||||||
</sect3>
|
</sect3>
|
||||||
|
@ -1877,8 +1859,8 @@ U stable/9/share/man/man4/netmap.4
|
||||||
of <command>svn status</command> and <command>svn
|
of <command>svn status</command> and <command>svn
|
||||||
diff</command> before committing.</para>
|
diff</command> before committing.</para>
|
||||||
|
|
||||||
<para>Mistakes will happen, but, unlike with
|
<para>Mistakes will happen but,
|
||||||
<acronym>CVS</acronym>, they can generally be fixed without
|
they can generally be fixed without
|
||||||
disruption.</para>
|
disruption.</para>
|
||||||
|
|
||||||
<para>Take a case of adding a file in the wrong location. The
|
<para>Take a case of adding a file in the wrong location. The
|
||||||
|
|
Loading…
Reference in a new issue