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

Clarify the text for a commit from a PR, making it clear that the explanatory

Browse source 
text should not be part of the log.
This commit is contained in:
Nik Clayton 2001-04-08 17:26:41 +00:00
parent 89f882875b
commit 3701fb2419
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=9139
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.58 2001/04/05 20:35:49 obrien Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.59 2001/04/07 18:22:32 obrien Exp $</pubdate>
<copyright>
<year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik 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.59 2001-04-07 18:22:32 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2180,8 +2180,9 @@ cvs add: use 'cvs commit' to add this file permanently
<example>
<title>Commit log for a commit based on a PR</title>
<para>John Smith has submitted a PR containing a patch, which has
been applied.</para>
<para>You want to commit a change based on a PR submitted by John
Smith containing a patch. The end of the commit message should
look something like this.</para>
<programlisting>...

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

@ -19,7 +19,7 @@
</author>
</authorgroup>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.58 2001/04/05 20:35:49 obrien Exp $</pubdate>
<pubdate>$FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.59 2001/04/07 18:22:32 obrien Exp $</pubdate>
<copyright>
<year>1999</year>
@ -516,11 +516,11 @@
</itemizedlist>
<para>You'll almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik 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.59 2001-04-07 18:22:32 obrien Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.59 2001-04-07 18:22:32 obrien Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.60 2001-04-08 17:26:41 nik Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2180,8 +2180,9 @@ cvs add: use 'cvs commit' to add this file permanently
<example>
<title>Commit log for a commit based on a PR</title>
<para>John Smith has submitted a PR containing a patch, which has
been applied.</para>
<para>You want to commit a change based on a PR submitted by John
Smith containing a patch. The end of the commit message should
look something like this.</para>
<programlisting>...