[Cvs-cvs] ccvs/doc ChangeLog cvs.texinfo stamp-vti versio... [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <address@hidden>     06/03/01 21:58:19

Modified files:
        doc            : ChangeLog cvs.texinfo stamp-vti version.texi 

Log message:
        * cvs.texinfo (Editing administrative files): Import changes from Wiki.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.721.2.117&tr2=1.721.2.118&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?only_with_tag=cvs1-11-x-branch&tr1=1.545.2.61&tr2=1.545.2.62&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?only_with_tag=cvs1-11-x-branch&tr1=1.19.2.84&tr2=1.19.2.85&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?only_with_tag=cvs1-11-x-branch&tr1=1.20.2.84&tr2=1.20.2.85&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.721.2.117 ccvs/doc/ChangeLog:1.721.2.118
--- ccvs/doc/ChangeLog:1.721.2.117      Fri Dec  9 17:51:36 2005
+++ ccvs/doc/ChangeLog  Wed Mar  1 21:58:19 2006
@@ -1,3 +1,7 @@
+2006-02-28  Derek Price  <address@hidden>
+
+       * cvs.texinfo (Editing administrative files): Import changes from Wiki.
+
 2005-12-09  Derek Price  <address@hidden>
 
        [patch #4634]
Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.545.2.61 ccvs/doc/cvs.texinfo:1.545.2.62
--- ccvs/doc/cvs.texinfo:1.545.2.61     Thu Nov 10 18:16:36 2005
+++ ccvs/doc/cvs.texinfo        Wed Mar  1 21:58:19 2006
@@ -1809,7 +1809,15 @@
 file.  You can often fix the error and check in a new
 revision, but sometimes a particularly bad error in the
 administrative file makes it impossible to commit new
-revisions.
+revisions.  If and when this happens, you can correct
+the problem by temporarily copying a corrected administrative file
+directly into the @code{$CVSROOT/CVSROOT} repository directory,
+then committing the same correction via a checkout of the @file{CVSROOT}
+module.  It is important that the correction also be made via the
+checked out copy, or the next checkout and commit to the
+<code>CVSROOT</code> module will overwrite the correction that was
+copied directly into the repository, possibly breaking things in such
+a way as to prevent commits again.
 @c @xref{Bad administrative files} for a hint
 @c about how to solve such situations.
 @c -- administrative file checking--
Index: ccvs/doc/stamp-vti
diff -u ccvs/doc/stamp-vti:1.19.2.84 ccvs/doc/stamp-vti:1.19.2.85
--- ccvs/doc/stamp-vti:1.19.2.84        Thu Nov 10 18:16:36 2005
+++ ccvs/doc/stamp-vti  Wed Mar  1 21:58:19 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 10 November 2005
address@hidden UPDATED-MONTH November 2005
address@hidden UPDATED 28 February 2006
address@hidden UPDATED-MONTH February 2006
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.20.2.84 ccvs/doc/version.texi:1.20.2.85
--- ccvs/doc/version.texi:1.20.2.84     Thu Nov 10 18:16:36 2005
+++ ccvs/doc/version.texi       Wed Mar  1 21:58:19 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 10 November 2005
address@hidden UPDATED-MONTH November 2005
address@hidden UPDATED 28 February 2006
address@hidden UPDATED-MONTH February 2006
 @set EDITION 1.11.21.1
 @set VERSION 1.11.21.1