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

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   10/06/03 01:09:57

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

Log message:
        Merge changes from cvs1-11-x-branch

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.993&r2=1.994
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.711&r2=1.712
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&r1=1.216&r2=1.217
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&r1=1.218&r2=1.219

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.993
retrieving revision 1.994
diff -u -b -r1.993 -r1.994
--- ChangeLog   15 Dec 2009 23:17:34 -0000      1.993
+++ ChangeLog   3 Jun 2010 01:09:56 -0000       1.994
@@ -1,3 +1,9 @@
+2010-06-02  Larry Jones  <address@hidden>
+
+       *cvs.texinfo (Error messages): Add "Cannot initialize repository
+       under existing CVSROOT".
+       * cvs.1, stamp-vti, version.texi: Regenerated.
+
 2009-12-15  Larry Jones  <address@hidden>
 
        * cvs.texinfo (commitinfo): Add example.

Index: cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.711
retrieving revision 1.712
diff -u -b -r1.711 -r1.712
--- cvs.texinfo 15 Dec 2009 23:17:34 -0000      1.711
+++ cvs.texinfo 3 Jun 2010 01:09:56 -0000       1.712
@@ -16221,6 +16221,15 @@
 @item cannot commit files as 'root'
 See @samp{'root' is not allowed to commit files}.
 
address@hidden cvs [init aborted]: Cannot initialize repository under existing 
CVSROOT: @var{dir}
+This message indicates that the directory (which is a parent
+of the specified @sc{cvs} root) contains a @file{CVSROOT}
+subdirectory and thus appears to be a repository.
+You are not allowed to create a repository inside another repository.
+This message can also occur if you try to create a repository that
+is named @file{CVSROOT};
+you should use a different name.
+
 @c For one example see basica-1a10 in the testsuite
 @c For another example, "cvs co ." on NT; see comment
 @c at windows-NT/filesubr.c (expand_wild).

Index: stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- stamp-vti   15 Dec 2009 23:17:34 -0000      1.216
+++ stamp-vti   3 Jun 2010 01:09:57 -0000       1.217
@@ -1,4 +1,4 @@
address@hidden UPDATED 15 December 2009
address@hidden UPDATED-MONTH December 2009
address@hidden UPDATED 2 June 2010
address@hidden UPDATED-MONTH June 2010
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- version.texi        15 Dec 2009 23:17:34 -0000      1.218
+++ version.texi        3 Jun 2010 01:09:57 -0000       1.219
@@ -1,4 +1,4 @@
address@hidden UPDATED 15 December 2009
address@hidden UPDATED-MONTH December 2009
address@hidden UPDATED 2 June 2010
address@hidden UPDATED-MONTH June 2010
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1