Date: Sun, 30 Jun 2013 01:37:37 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r42088 - head/en_US.ISO8859-1/articles/committers-guide Message-ID: <201306300137.r5U1bbqA091551@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Sun Jun 30 01:37:37 2013 New Revision: 42088 URL: http://svnweb.freebsd.org/changeset/doc/42088 Log: Additional whitespace-only fixes. Translators, please ignore. 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 Jun 30 01:00:50 2013 (r42087) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Jun 30 01:37:37 2013 (r42088) @@ -140,7 +140,6 @@ <row> <entry><emphasis>Noteworthy <literal>src/</literal> SVN Branches</emphasis></entry> - <entry> <literal>stable/8</literal> (8.X-STABLE), <literal>stable/9</literal> (9.X-STABLE), @@ -241,30 +240,36 @@ in <filename>src/</filename></title> <itemizedlist> - <listitem><para>doc committers may commit documentation - changes to src files, such as man pages, READMEs, fortune - databases, calendar files, and comment fixes without - approval from a src committer, subject to the normal care - and tending of commits.</para></listitem> - - <listitem><para>doc committers may commit minor src changes - and fixes, such as build fixes, small features, etc, with an - "Approved by" from a src committer.</para></listitem> - - <listitem><para>doc committers may seek an upgrade to a src - commit bit by acquiring a mentor, who will propose the doc - committer to core. When approved, they will be added to - 'access' and the normal mentoring period will ensue, which - will involve a continuing of <quote>Approved by</quote> for - some period.</para></listitem> - - <listitem><para>"Approved by" is only acceptable from - non-mentored src committers -- mentored committers can - provide a "Reviewed by" but not an "Approved - by".</para></listitem> + <listitem> + <para>doc committers may commit documentation changes to src + files, such as man pages, READMEs, fortune databases, + calendar files, and comment fixes without approval from a + src committer, subject to the normal care and tending of + commits.</para> + </listitem> + + <listitem> + <para>doc committers may commit minor src changes and fixes, + such as build fixes, small features, etc, with an + "Approved by" from a src committer.</para> + </listitem> + + <listitem> + <para>doc committers may seek an upgrade to a src commit bit + by acquiring a mentor, who will propose the doc committer + to core. When approved, they will be added to 'access' + and the normal mentoring period will ensue, which will + involve a continuing of <quote>Approved by</quote> for + some period.</para> + </listitem> + + <listitem> + <para>"Approved by" is only acceptable from non-mentored src + committers -- mentored committers can provide a "Reviewed + by" but not an "Approved by".</para> + </listitem> </itemizedlist> </sect2> - </sect1> <sect1 id="subversion-primer"> @@ -336,30 +341,37 @@ <listitem> <para>Commits are atomic.</para> </listitem> + <listitem> <para>Revision numbers apply across the repository—all files that were modified in the same commit have the same revision number.</para> </listitem> + <listitem> <para>Branching and tagging are namespace operations.</para> </listitem> + <listitem> <para>Directories are versioned.</para> </listitem> + <listitem> <para>Files and directories can have arbitrary, versioned metadata attached to them.</para> </listitem> + <listitem> <para>Files and directories can be copied, with full history tracking.</para> </listitem> + <listitem> <para>No more contortions due to <acronym>CVS</acronym> weakness such as applying &man.patch.1; files at compile time in order to avoid touching vendor branch code.</para> </listitem> + <listitem> <para>No more repo-copies.</para> </listitem> @@ -520,6 +532,7 @@ <emphasis>releng</emphasis> and <emphasis>release</emphasis> directories.</para> </listitem> + <listitem> <para><emphasis>/projects</emphasis> and <emphasis>/user</emphasis> feature a branch work area, @@ -557,11 +570,13 @@ code for articles written by various &os; contributors.</para> </listitem> + <listitem> <para><emphasis>/books/</emphasis> contains the source code for the different books, such as the &os; Handbook.</para> </listitem> + <listitem> <para><emphasis>/htdocs/</emphasis> contains the source code for the &os; website.</para> @@ -909,18 +924,21 @@ working directory (which one presumes has been edited to resolve the conflicts).</para> </listitem> + <listitem> <para><literal>base</literal>: use a pristine copy of the version you had before <command>svn update</command>, discarding your own changes, the conflicting changes, and possibly other intervening changes as well.</para> </listitem> + <listitem> <para><literal>mine-full</literal>: use what you had before <command>svn update</command>, including your own changes, but discarding the conflicting changes, and possibly other intervening changes as well.</para> </listitem> + <listitem> <para><literal>theirs-full</literal>: use the version that was retrieved when you did <command>svn @@ -961,10 +979,12 @@ <para><literal>empty</literal>: the directory itself without any of its contents.</para> </listitem> + <listitem> <para><literal>files</literal>: the directory and any files it contains.</para> </listitem> + <listitem> <para><literal>immediates</literal>: the directory and any files and directories it contains, but none of the @@ -1013,18 +1033,22 @@ <para><literal>log</literal>, <literal>diff</literal></para> </listitem> + <listitem> <para><literal>mkdir</literal></para> </listitem> + <listitem> <para><literal>remove</literal>, <literal>copy</literal>, <literal>rename</literal></para> </listitem> + <listitem> <para><literal>propset</literal>, <literal>propedit</literal>, <literal>propdel</literal></para> </listitem> + <listitem> <para><literal>merge</literal></para> </listitem> @@ -1311,13 +1335,16 @@ <listitem> <para>revision <literal>$R</literal></para> </listitem> + <listitem> <para>in directory $target in stable branch $B</para> </listitem> + <listitem> <para>from directory $source in head</para> </listitem> + <listitem> <para>$FSVN is <literal>svn+ssh://svn.freebsd.org/base</literal></para> @@ -1531,6 +1558,7 @@ U stable/9/share/man/man4/netmap.4 similar, and putting the <command>svn commit</command> off until the end of the process.</para> </sect5> + <sect5> <title>Cleaning Up</title> @@ -1634,6 +1662,7 @@ U stable/9/share/man/man4/netmap.4 <command>svn stat</command> and <command>svn diff</command> commands.</para> </sect5> + <sect5> <title>Tagging</title> @@ -1858,9 +1887,9 @@ U stable/9/share/man/man4/netmap.4 <para>The seed mirror is set to fetch from <literal>svn://svn.freebsd.org/base</literal>. The - configuration for the mirror is stored in <literal>revprop - 0</literal> on the local mirror. To see the - configuration, try:</para> + configuration for the mirror is stored in + <literal>revprop 0</literal> on the local mirror. To see + the configuration, try:</para> <screen>&prompt.user; <userinput>svn proplist -v --revprop -r 0 file:///home/svnmirror/base</userinput></screen> @@ -1929,6 +1958,7 @@ U stable/9/share/man/man4/netmap.4 <para>To collapse everything back at the end:</para> <screen>&prompt.user; <userinput>svn write me</userinput></screen> + --> </sect3> </sect2> @@ -1950,8 +1980,9 @@ ControlPath ~/.ssh/sockets/master-%l-%r@ ControlMaster auto ControlPersist yes</screen> - <para>and then typing</para> - <screen><userinput>mkdir ~/.ssh/sockets</userinput></screen> + <para>and then typing</para> + + <screen><userinput>mkdir ~/.ssh/sockets</userinput></screen> <para>Checking out a working copy with a stock Subversion client without &os;-specific patches
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306300137.r5U1bbqA091551>