diff options
| author | Giorgos Keramidas <keramida@FreeBSD.org> | 2004-10-11 16:48:38 +0000 |
|---|---|---|
| committer | Giorgos Keramidas <keramida@FreeBSD.org> | 2004-10-11 16:48:38 +0000 |
| commit | 22d00e050e229523a1df5f98771839be6f220aa8 (patch) | |
| tree | 0ac85ade729b82a1a7988cc7479679c9d3c01fa8 | |
| parent | a978c10d524c5c112764b133106a606907664722 (diff) | |
Notes
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.sgml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index e5a4baca1c..58f3a1652e 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -727,11 +727,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o </itemizedlist> <para>You will almost certainly get a conflict because - of the <literal>$Id: article.sgml,v 1.213 2004-09-20 11:04:00 marck Exp $</literal> (or in FreeBSD's case, + of the <literal>$Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $</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: article.sgml,v 1.213 2004-09-20 11:04:00 marck Exp $</literal> line, - leaving the original <literal>$Id: article.sgml,v 1.213 2004-09-20 11:04:00 marck Exp $</literal> line intact).</para> + (remove the marker lines and the second <literal>$Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $</literal> line, + leaving the original <literal>$Id: article.sgml,v 1.214 2004-10-11 16:48:38 keramida Exp $</literal> line intact).</para> </listitem> <listitem> @@ -1015,8 +1015,18 @@ checkout -P</programlisting> 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> + <command>cvs commit</command> and insert it into the commit + message or save it in a file before committing and use the + <option>-F</option> option of CVS to read the commit message from + that file, i.e.</para> + + <screen>&prompt.user; <userinput>vi logmsg</userinput> +&prompt.user; <userinput>cvs ci -F logmsg shazam</userinput></screen> + + <para>This is the fastest way of passing a commit message to CVS but + you should be careful when editing the <filename>logmsg</filename> + file before the commit, because CVS won't give you a chance to edit + the message when you do the actual commit.</para> </listitem> </orderedlist> |