os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove the "Never touch the repository directly" rule. Committers no

Browse source 
longer have direct access to RCS files.

No objections from: -developers
This commit is contained in:
Mike Barcroft 2003-02-22 05:21:12 +00:00
parent c749827b8f
commit 2780b3d130
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=16091
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -608,11 +608,11 @@
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.155 2003-02-18 11:36:42 blackend Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.155 2003-02-18 11:36:42 blackend Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.155 2003-02-18 11:36:42 blackend Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.156 2003-02-22 05:21:12 mike Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>
@ -1503,11 +1503,6 @@ docs:Documentation Bug:nik:</programlisting>
directory).</para> directory).</para>
</listitem> </listitem>
<listitem>
<para>Never touch the repository directly. Ask a
Repomeister.</para>
</listitem>
<listitem> <listitem>
<para>Any disputed change must be backed out pending <para>Any disputed change must be backed out pending
resolution of the dispute if requested by a maintainer. resolution of the dispute if requested by a maintainer.