From 2dab8ff80756fbc5f100c1972d31d508c130925a Mon Sep 17 00:00:00 2001
From: scjones <scjones@users.savannah.nongnu.org>
Date: Thu, 3 Jun 2010 01:09:57 +0000
Subject: [PATCH] Merge changes from cvs1-11-x-branch
---
doc/ChangeLog | 6 ++++++
doc/cvs.texinfo | 9 +++++++++
doc/stamp-vti | 4 ++--
doc/version.texi | 4 ++--
4 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 39939323d..0466a5d7a 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-02 Larry Jones <lawrence.jones@siemens.com>
+
+ *cvs.texinfo (Error messages): Add "Cannot initialize repository
+ under existing CVSROOT".
+ * cvs.1, stamp-vti, version.texi: Regenerated.
+
2009-12-15 Larry Jones <lawrence.jones@siemens.com>
* cvs.texinfo (commitinfo): Add example.
diff --git a/doc/cvs.texinfo b/doc/cvs.texinfo
index 1b348a14d..fa1514063 100644
--- a/doc/cvs.texinfo
+++ b/doc/cvs.texinfo
@@ -16221,6 +16221,15 @@ temporary directory.
@item cannot commit files as 'root'
See @samp{'root' is not allowed to commit files}.
+@item 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).
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 5aebce8bb..628a7e8de 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 15 December 2009
-@set UPDATED-MONTH December 2009
+@set UPDATED 2 June 2010
+@set UPDATED-MONTH June 2010
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
diff --git a/doc/version.texi b/doc/version.texi
index 5aebce8bb..628a7e8de 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 15 December 2009
-@set UPDATED-MONTH December 2009
+@set UPDATED 2 June 2010
+@set UPDATED-MONTH June 2010
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
--
GitLab