Date: Mon, 30 Mar 2015 08:25:39 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46392 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201503300825.t2U8PdoT052114@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Mon Mar 30 08:25:38 2015 New Revision: 46392 URL: https://svnweb.freebsd.org/changeset/doc/46392 Log: stop comparing to CVS Finish the job of r45149 and remove reference to now undocumented 'better features' of CVS. Remove note about difference between location of www repo between CVS and SVN: we switched long enough ago now that it doesn't matter. Remove additional comparisons to CVS which likely don't matter to committers anymore. 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 Sun Mar 29 15:35:18 2015 (r46391) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Mon Mar 30 08:25:38 2015 (r46392) @@ -473,28 +473,11 @@ You need a Passphrase to protect your se The first real <acronym>SVN</acronym> commit is <emphasis>r38821</emphasis>.</para> - <note> - <para>Part of the <literal>doc/www</literal> - <acronym>CVS</acronym> to <acronym>SVN</acronym> conversion - included an infrastructural change to the build process. - The most notable change is the location of the - &os; website <literal>www</literal> tree, which has - been moved from - <literal>www/<replaceable>lang</replaceable>/</literal> to - <literal>head/<replaceable>lang</replaceable>/htdocs/</literal>.</para> - </note> - <para>The &os; <literal>ports</literal> repository switched from <acronym>CVS</acronym> to Subversion on July 14th, 2012. The first real <acronym>SVN</acronym> commit is <emphasis>r300894</emphasis>.</para> - <para>Subversion has a number of features that - should make developers' lives easier. The most important - advantage to Subversion (and the reason why &os; switched) is - that it handles branches and merging much better than CVS - does. Some of the principal differences are:</para> - <para>Subversion can be installed from the &os; Ports Collection by issuing these commands:</para> @@ -562,9 +545,7 @@ You need a Passphrase to protect your se User jarjar</programlisting> <para>This is the simplest method, but it is hard to tell just - yet how much load it will place on the repository. - Subversion is much faster than <acronym>CVS</acronym>, - however.</para> + yet how much load it will place on the repository.</para> <note> <para>The <command>svn diff</command> does not require @@ -594,8 +575,7 @@ You need a Passphrase to protect your se 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 + <para>The hassle of a local <command>svnsync</command> mirror probably is not worth it unless the network connectivity situation or other factors demand it. If it is needed, see the end of this chapter for @@ -869,8 +849,7 @@ You need a Passphrase to protect your se <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 + <para>To commit all changes in the current directory and all subdirectories:</para> <screen>&prompt.user; <userinput>svn commit</userinput></screen> @@ -1859,9 +1838,7 @@ U stable/9/share/man/man4/netmap.4 <literal>\^/head</literal>.</para> </note> - <para>It is necessary to resolve any merge conflicts. - This process is the same in <acronym>SVN</acronym> as in - <acronym>CVS</acronym>.</para> + <para>It is necessary to resolve any merge conflicts.</para> <para>Make sure that any files that were added or removed in the vendor tree have been properly added or removed in the @@ -2925,7 +2902,7 @@ Relnotes: yes</programlisting> build infrastructure, approving new documentation committers, and ensuring that the &os; website and documentation on the FTP site is up to date with respect - to the CVS tree. It is not a conflict resolution body. + to the <application>subversion</application> tree. It is not a conflict resolution body. The vast majority of documentation related discussion takes place on the &a.doc;. More details regarding the doceng team can be found in its <link
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503300825.t2U8PdoT052114>