Date: Wed, 25 Mar 2009 14:48:06 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 159803 for review Message-ID: <200903251448.n2PEm6DN064219@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159803 Change 159803 by rene@rene_self on 2009/03/25 14:47:14 Several changes to the committers guide: * use corpauthor for the author (FDP) * CVS tags are now more useful as CVSup tags * replace miscfs and ports/Mk examples by ports/Tools, readd some examples * add SVN to note that CVS stores metadata locally * remove commented out 'cvs -j' examples Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#19 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#19 (text+ko) ==== @@ -7,11 +7,7 @@ <articleinfo> <title>Committer's Guide</title> - <authorgroup> - <author> - <surname>The FreeBSD Documentation Project</surname> - </author> - </authorgroup> + <corpauthor>The &os; Documentation Project</corpauthor> <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.281 2009/01/07 20:32:16 rene Exp $</pubdate> @@ -115,11 +111,11 @@ </row> <row> - <entry><emphasis>Noteworthy CVS Tags</emphasis></entry> + <entry><emphasis>Noteworthy CVSup Tags</emphasis></entry> <entry> <literal>RELENG_6</literal> (6.X-STABLE), <literal>RELENG_7</literal> (7.X-STABLE), - <literal>HEAD</literal> (-CURRENT) + <literal>.</literal> (-CURRENT) </entry> </row> @@ -357,7 +353,7 @@ <para>This way they can do all CVS operations locally and use <command><replaceable>X</replaceable>cvs commit</command> for committing to the official CVS tree. If you wish to add - something which is wholly new + something which is wholly new, <command>cvs import</command> should be used. Refer to the &man.cvs.1; manual page for usage.</para> @@ -445,68 +441,72 @@ <itemizedlist> <listitem> - <para>Check out the <filename>Mk</filename> module, - which corresponds to <filename>ports/Mk</filename>:</para> + <para>Check out the <filename>Tools</filename> module, + which corresponds to <filename>ports/Tools</filename>:</para> - <screen>&prompt.user; <userinput>pcvs co ports/Mk</userinput></screen> + <screen>&prompt.user; <userinput>cvs co Tools</userinput></screen> - <para>You now have a directory named <filename>ports/Mk</filename> - with subdirectory <filename>CVS</filename>.</para> + <para>You now have a directory named <filename>ports/Tools</filename> + with subdirectories <filename>portbuild</filename>, <filename>scripts</filename>, and <filename>CVS</filename>.</para> </listitem> + <listitem> + <para>Check out the same files, but with full path:</para> + + <screen>&prompt.user; <userinput>cvs co ports/Tools</userinput></screen> + + <para>You now have a directory named <filename>ports</filename>, + with subdirectories <filename>CVS</filename> and + <filename>Tools</filename>. The <filename>ports/Tools</filename> directory has + subdirectories <filename>CVS</filename> and + <filename>scripts</filename>, etc.</para> + </listitem> <listitem> - <para>Check out the directory <filename>modules</filename>, but + <para>Check out the directory <filename>Tools</filename>, but none of the subdirectories:</para> - <screen>&prompt.user; <userinput>cvs co -l miscfs</userinput></screen> + <screen>&prompt.user; <userinput>cvs co -l Tools</userinput></screen> - <para>You now have a directory named <filename>miscfs</filename> + <para>You now have a directory named <filename>Tools</filename> with just one subdirectory named <filename>CVS</filename>.</para> </listitem> <listitem> - <para>Check out the <filename>miscfs</filename> module as - it is in the 6.X branch:</para> + <para>Check out the <filename>Tools</filename> module as + it was when support for &os; 5.X was dropped:</para> - <screen>&prompt.user; <userinput>cvs co -rRELENG_6 miscfs</userinput></screen> - <para>You can modify the sources and commit along this - branch.</para> - </listitem> - - <listitem> - <para>Check out the <filename>miscfs</filename> module as - it was in 6.0-RELEASE.</para> - - <screen>&prompt.user; <userinput>cvs co -rRELENG_6_0_0_RELEASE miscfs</userinput></screen> + <screen>&prompt.user; <userinput>cvs co -rRELEASE_5_EOL Tools</userinput></screen> <para>You will not be able to commit modifications, since - <literal>RELENG_6_0_0_RELEASE</literal> is a point in time, not a branch.</para> + <literal>RELEASE_5_EOL</literal> is a point in time, not a branch.</para> </listitem> <listitem> - <para>Check out the <filename>miscfs</filename> module as it was - on Jan 15 2000.</para> + <para>Check out the <filename>Tools</filename> module as it was + on March 25th, 2009:</para> - <screen>&prompt.user; <userinput>cvs co -D'01/15/2000' miscfs</userinput></screen> + <screen>&prompt.user; <userinput>cvs co -D'03/25/2009' Tools</userinput></screen> <para>You will not be able to commit modifications.</para> </listitem> <listitem> - <para>Check out the <filename>miscfs</filename> module as it was - one week ago.</para> + <para>Check out the <filename>Tools</filename> module as it was + one week ago:</para> - <screen>&prompt.user; <userinput>cvs co -D'last week' miscfs</userinput></screen> + <screen>&prompt.user; <userinput>cvs co -D'last week' Tools</userinput></screen> <para>You will not be able to commit modifications.</para> </listitem> </itemizedlist> <para>Note that cvs stores metadata in subdirectories named - <filename>CVS</filename>.</para> + <filename>CVS</filename>. + Similarly, SVN stores metadata in subdirectories named + <filename>.svn</filename>.</para> <para>Arguments to <option>-D</option> and <option>-r</option> are sticky, which means cvs will remember them later, e.g. @@ -593,12 +593,6 @@ <entry><option>-A</option></entry> <entry>Update to head of main branch.</entry> </row> -<!--XXX obsolete? - <row> - <entry><option>-j<replaceable>rev</replaceable></option></entry> - <entry>More magic (see below).</entry> - </row> ---> </tbody> </tgroup> </informaltable> @@ -699,43 +693,6 @@ repository version, followed by a marker line with seven <literal>></literal> signs and the revision number you updated to.</para> - -<!--XXX obsolete? - <para>The <option>-j</option> option is slightly voodoo. It - updates the local file to the specified revision as if you - used <option>-r</option>, but it does not change the recorded - revision number or branch of the local file. It is not really - useful except when used twice, in which case it will merge the - changes between the two specified versions into the working - copy.</para> - - <para>For instance, say you commit a change to - <filename>shazam/shazam.c</filename> in &os.current; and later - want to MFC it. The change you want to MFC was revision - 1.15:</para> - - <itemizedlist> - <listitem> - <para>Check out the &os.stable; version of the - <filename>shazam</filename> module:</para> - - <screen>&prompt.user; <userinput>cvs co -rRELENG_6 shazam</userinput></screen> - </listitem> - - <listitem> - <para>Apply the changes between rev 1.14 and 1.15:</para> - - <screen>&prompt.user; <userinput>cvs update -j1.14 -j1.15 shazam/shazam.c</userinput></screen> - </listitem> - </itemizedlist> - - <para>You will almost certainly get a conflict because - of the <literal>$Id$</literal> (or in FreeBSD's case, - <literal>$<!- stop expansion ->FreeBSD<!- stop expansion ->$</literal>) - lines, so you will have to edit the file to resolve the conflict - (remove the marker lines and the second <literal>$Id$</literal> line, - leaving the original <literal>$Id$</literal> line intact).</para> ---> </listitem> <listitem>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903251448.n2PEm6DN064219>