From b0f39ddd51a01a0160b7072036a8b39ba9a482a0 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Fri, 3 Nov 2000 19:01:27 +0000 Subject: [PATCH] Add a note that leaving `cvs ci' in message editing mode for long period of time is no-no. Reviewed by: jhb --- .../articles/committers-guide/article.sgml | 18 ++++++++++++++---- .../articles/committers-guide/article.sgml | 18 ++++++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 8526df460a..5b860d9e13 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.41 2000/10/09 17:08:39 obrien Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.42 2000/10/09 17:09:14 obrien Exp $ 1999 @@ -512,11 +512,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $ line, leaving the original - $Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $ line intact). + the second $Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $ line, leaving the original + $Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $ line intact). @@ -752,6 +752,16 @@ checkout -P the resident AI (cvs@FreeBSD.org) for help when you screw up. + + + Don't leave the cvs commit 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 + cvs commit, and insert it into the commit + message. + diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index 8526df460a..5b860d9e13 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.41 2000/10/09 17:08:39 obrien Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.42 2000/10/09 17:09:14 obrien Exp $ 1999 @@ -512,11 +512,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $ line, leaving the original - $Id: article.sgml,v 1.42 2000-10-09 17:09:14 obrien Exp $ line intact). + the second $Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $ line, leaving the original + $Id: article.sgml,v 1.43 2000-11-03 19:01:27 sobomax Exp $ line intact). @@ -752,6 +752,16 @@ checkout -P the resident AI (cvs@FreeBSD.org) for help when you screw up. + + + Don't leave the cvs commit 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 + cvs commit, and insert it into the commit + message. +