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

Add a note that leaving `cvs ci' in message editing mode for long period of time

Browse source 
is no-no.

Reviewed by:	jhb
This commit is contained in:
Maxim Sobolev 2000-11-03 19:01:27 +00:00
parent a3657a4744
commit b0f39ddd51
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=8284
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.41 2000/10/09 17:08:39 obrien Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.42 2000/10/09 17:09:14 obrien Exp $</pubdate>
<copyright>
<year>1999</year>
@ -512,11 +512,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -752,6 +752,16 @@ checkout -P</programlisting>
the resident AI (<email>cvs@FreeBSD.org</email>) for help when
you screw up.</para>
</listitem>
<listitem>
<para>Don't leave the <command>cvs commit</command> command in commit
message editing mode for too long (more than 2-3 minutes). It
locks the directory you are working with and will prevent other
developers from committing into the same directory. If you have
to type a long commit message, type it before executing
<command>cvs commit</command>, and insert it into the commit
message.</para>
</listitem>
</orderedlist>
</sect1>

18
en_US.ISO_8859-1/articles/committers-guide/article.sgml
View file

@ -16,7 +16,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.41 2000/10/09 17:08:39 obrien Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.42 2000/10/09 17:09:14 obrien Exp $</pubdate>
<copyright>
<year>1999</year>
@ -512,11 +512,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $</literal> (or in FreeBSD's case,
<literal>$FreeBSD<!-- stop expansion -->$</literal>) lines, so you'll have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -752,6 +752,16 @@ checkout -P</programlisting>
the resident AI (<email>cvs@FreeBSD.org</email>) for help when
you screw up.</para>
</listitem>
<listitem>
<para>Don't leave the <command>cvs commit</command> command in commit
message editing mode for too long (more than 2-3 minutes). It
locks the directory you are working with and will prevent other
developers from committing into the same directory. If you have
to type a long commit message, type it before executing
<command>cvs commit</command>, and insert it into the commit
message.</para>
</listitem>
</orderedlist>
</sect1>