[Cvs-cvs] ccvs/src ChangeLog root.c sanity.sh

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     08/09/10 16:43:55

Modified files:
        src            : ChangeLog root.c sanity.sh 

Log message:
        * root.c (Name_Root): Remove unneeded article from error message.
        * sanity.sh: Update to compensate.
        (dirs-4): Improve FIXCVS comment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3569&r2=1.3570
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/root.c?cvsroot=cvs&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1196&r2=1.1197

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3569
retrieving revision 1.3570
diff -u -b -r1.3569 -r1.3570
--- ChangeLog   10 Sep 2008 16:29:19 -0000      1.3569
+++ ChangeLog   10 Sep 2008 16:43:53 -0000      1.3570
@@ -1,5 +1,9 @@
 2008-09-10  Derek R. Price  <address@hidden>
 
+       * root.c (Name_Root): Remove unneeded article from error message.
+       * sanity.sh: Update to compensate.
+       (dirs-4): Improve FIXCVS comment.
+
        * recurse.c (do_recursion): Quote UPDATE_DIR in output.  Use new
        NULL2DOT macro.
        * root.c: Include "quote.h".

Index: root.c
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/root.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- root.c      10 Sep 2008 16:29:19 -0000      1.135
+++ root.c      10 Sep 2008 16:43:54 -0000      1.136
@@ -121,7 +121,7 @@
     {
        char *admfile = dir_append (update_dir, CVSADM_ROOT);
        error (0, 0,
-              "ignoring %s because it specifies a non-existent repository %s",
+              "ignoring %s because it specifies non-existent repository %s",
               quote_n (0, admfile), quote_n (1, root));
        free (admfile);
        ret = NULL;

Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1196
retrieving revision 1.1197
diff -u -b -r1.1196 -r1.1197
--- sanity.sh   10 Sep 2008 16:29:20 -0000      1.1196
+++ sanity.sh   10 Sep 2008 16:43:54 -0000      1.1197
@@ -7638,8 +7638,12 @@
 
          # If we say "yes", then CVS gives errors about not being able to
          # create lock files.
-         # The fact that it says "skipping directory `.'" rather than
-         # "skipping directory `dir1/sdir'" is some kind of bug.
+         #
+         # FIXCVS:
+         # The fact that it says "warning: skipping `.'" rather than
+         # "warning: skipping `dir1/sdir'" is a bug caused by the fact that
+         # release.c is changing directory before calling update as a
+         # subprocess.
          dotest dirs-4 "echo no | ${testcvs} release -d dir1/sdir" \
 "$SPROG update: cannot open directory $CVSROOT_DIRNAME/dir1/sdir: No such file 
or directory
 $SPROG update: skipping directory \`.'
@@ -32154,7 +32158,7 @@
 No such file or directory"
          else
            dotest reposmv-2 "$testcvs update" \
-"$DOTSTAR$CPROG update: ignoring \`CVS/Root' because it specifies a 
non-existent repository \`$TESTDIR/root1'
+"$DOTSTAR$CPROG update: ignoring \`CVS/Root' because it specifies non-existent 
repository \`$TESTDIR/root1'
 $CPROG update: Updating \.
 $DOTSTAR$CPROG update: cannot open directory $CVSROOT_DIRNAME/dir1: No such 
file or directory
 $CPROG update: skipping directory \`.'"
@@ -32172,7 +32176,7 @@
            CVSROOT_save=$CVSROOT
            CVSROOT=$TESTDIR/root-moved; export CVSROOT
            dotest reposmv-3 "$testcvs update" \
-"$DOTSTAR$CPROG update: ignoring \`CVS/Root' because it specifies a 
non-existent repository \`$TESTDIR/root1'
+"$DOTSTAR$CPROG update: ignoring \`CVS/Root' because it specifies non-existent 
repository \`$TESTDIR/root1'
 $CPROG update: Updating \.$DOTSTAR"
            CVSROOT=$CVSROOT_save; export CVSROOT
          fi
@@ -32191,7 +32195,7 @@
            CVSROOT_save=${CVSROOT}
            CVSROOT=${TESTDIR}/root-none; export CVSROOT
            dotest_fail reposmv-4 "$testcvs update" \
-"$CPROG update: ignoring \`CVS/Root' because it specifies a non-existent 
repository \`$TESTDIR/root1'
+"$CPROG update: ignoring \`CVS/Root' because it specifies non-existent 
repository \`$TESTDIR/root1'
 $CPROG \[update aborted\]: $TESTDIR/root-none/CVSROOT: No such file or 
directory"
            CVSROOT=${CVSROOT_save}; export CVSROOT
          fi