[Cvs-cvs] ccvs doccvs.1 docstamp-vti docversion.texi src/...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/11 14:35:17

Modified files:
        doc            : cvs.1 stamp-vti version.texi 
        src            : ChangeLog sanity.sh 

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.1?cvsroot=cvs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&r1=1.188&r2=1.189
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&r1=1.190&r2=1.191
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3444&r2=1.3445
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1152&r2=1.1153

Patches:
Index: doc/cvs.1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.1,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- doc/cvs.1   8 Jun 2006 21:07:31 -0000       1.48
+++ doc/cvs.1   11 Jun 2006 14:35:16 -0000      1.49
@@ -2896,6 +2896,12 @@
 .IP "" 4
 A file was removed.
 .SP
+One record type results from the admin command:
+.IP "" 2
+\fBX\fR
+.IP "" 4
+The admin command.
+.SP
 The options shown as \fB-flags\fR constrain or expand
 the report without requiring option arguments:
 .SP

Index: doc/stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -b -r1.188 -r1.189
--- doc/stamp-vti       8 Jun 2006 21:07:31 -0000       1.188
+++ doc/stamp-vti       11 Jun 2006 14:35:16 -0000      1.189
@@ -1,4 +1,4 @@
address@hidden UPDATED 8 June 2006
address@hidden UPDATED 11 June 2006
 @set UPDATED-MONTH June 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: doc/version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- doc/version.texi    9 Jun 2006 21:28:17 -0000       1.190
+++ doc/version.texi    11 Jun 2006 14:35:16 -0000      1.191
@@ -1,4 +1,4 @@
address@hidden UPDATED 9 June 2006
address@hidden UPDATED 11 June 2006
 @set UPDATED-MONTH June 2006
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3444
retrieving revision 1.3445
diff -u -b -r1.3444 -r1.3445
--- src/ChangeLog       9 Jun 2006 21:28:17 -0000       1.3444
+++ src/ChangeLog       11 Jun 2006 14:35:16 -0000      1.3445
@@ -1,3 +1,8 @@
+2006-06-10  Derek Price  <address@hidden>
+
+       * sanity.sh (conflicts4): Don't expect specific file permissions.  Use
+       $PLUS.
+
 2006-06-09  Mark D. Baushke  <address@hidden>
 
        * admin.c (admin_fileproc): Used by NetBSD, add 'X' to the

Index: src/sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1152
retrieving revision 1.1153
diff -u -b -r1.1152 -r1.1153
--- src/sanity.sh       9 Jun 2006 21:28:17 -0000       1.1152
+++ src/sanity.sh       11 Jun 2006 14:35:16 -0000      1.1153
@@ -12407,10 +12407,10 @@
 "$DOTSTAR
 Argument --
 Directory .
-$DOTSTAR/first-dir
-Entry /file1/1.2/+=//
+$CVSROOT_DIRNAME/first-dir
+Entry /file1/1.2/$PLUS=//
 Modified file1
-u=rw,g=rw,o=r
+u=.*,g=.*,o=.*
 59
 baseline
 ""<<<<<<< file1
@@ -12441,8 +12441,8 @@
 "$DOTSTAR
 Argument --
 Directory .
-$DOTSTAR/first-dir
-Entry /file1/1.2/+=//
+$CVSROOT_DIRNAME/first-dir
+Entry /file1/1.2/$PLUS=//
 Unchanged file1
 update"