[Cvs-cvs] ccvs/doc ChangeLog cvs.texinfo stamp-vti versio...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/03/01 21:59:48

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

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/ChangeLog.diff?tr1=1.946&tr2=1.947&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/cvs.texinfo.diff?tr1=1.674&tr2=1.675&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/stamp-vti.diff?tr1=1.172&tr2=1.173&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/doc/version.texi.diff?tr1=1.173&tr2=1.174&r1=text&r2=text

Patches:
Index: ccvs/doc/ChangeLog
diff -u ccvs/doc/ChangeLog:1.946 ccvs/doc/ChangeLog:1.947
--- ccvs/doc/ChangeLog:1.946    Wed Jan 25 12:53:33 2006
+++ ccvs/doc/ChangeLog  Wed Mar  1 21:59:48 2006
@@ -1,3 +1,7 @@
+2006-02-28  Derek Price  <address@hidden>
+
+       * cvs.texinfo (Editing administrative files): Import changes from Wiki.
+
 2006-01-25  Mark D. Baushke  <address@hidden>
 
        * getdate.texi: Update from GNULIB.
Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.674 ccvs/doc/cvs.texinfo:1.675
--- ccvs/doc/cvs.texinfo:1.674  Sat Dec 31 23:34:22 2005
+++ ccvs/doc/cvs.texinfo        Wed Mar  1 21:59:48 2006
@@ -1838,7 +1838,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.172 ccvs/doc/stamp-vti:1.173
--- ccvs/doc/stamp-vti:1.172    Mon Jan 30 23:19:05 2006
+++ ccvs/doc/stamp-vti  Wed Mar  1 21:59:48 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 January 2006
address@hidden UPDATED-MONTH January 2006
address@hidden UPDATED 1 March 2006
address@hidden UPDATED-MONTH March 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1
Index: ccvs/doc/version.texi
diff -u ccvs/doc/version.texi:1.173 ccvs/doc/version.texi:1.174
--- ccvs/doc/version.texi:1.173 Mon Jan 30 23:19:05 2006
+++ ccvs/doc/version.texi       Wed Mar  1 21:59:48 2006
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 January 2006
address@hidden UPDATED-MONTH January 2006
address@hidden UPDATED 1 March 2006
address@hidden UPDATED-MONTH March 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1