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

[Mark D. Baushke]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Mark D. Baushke <address@hidden>        06/02/25 19:39:53

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

Log message:
        * edit.c (edit_fileproc): Do not assert (!check_edited) in
        --disable-client configurations.
        
        * sanity.sh (config-5): The number of lines in the config file
        vary with --disable-proxy configurations. Use [0-9][0-9]* to match
        the line number instead of an explicit line 98 in this test.
        (multiroot2-9a): Deal with Write_Template messages that will not
        occur in --disable-server configurations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3345&tr2=1.3346&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/edit.c.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1111&tr2=1.1112&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3345 ccvs/src/ChangeLog:1.3346
--- ccvs/src/ChangeLog:1.3345   Sat Feb 25 07:41:50 2006
+++ ccvs/src/ChangeLog  Sat Feb 25 19:39:53 2006
@@ -1,3 +1,14 @@
+2006-02-25  Mark D. Baushke  <address@hidden>
+
+       * edit.c (edit_fileproc): Do not assert (!check_edited) in
+       --disable-client configurations.
+
+       * sanity.sh (config-5): The number of lines in the config file
+       vary with --disable-proxy configurations. Use [0-9][0-9]* to match
+       the line number instead of an explicit line 98 in this test.
+       (multiroot2-9a): Deal with Write_Template messages that will not
+       occur in --disable-server configurations.
+
 2006-02-24  Mark D. Baushke  <address@hidden>
 
        * client.c (gzip_level): Move to...
Index: ccvs/src/edit.c
diff -u ccvs/src/edit.c:1.90 ccvs/src/edit.c:1.91
--- ccvs/src/edit.c:1.90        Thu Nov 10 15:13:15 2005
+++ ccvs/src/edit.c     Sat Feb 25 19:39:53 2006
@@ -350,8 +350,6 @@
 
 #if defined (CLIENT_SUPPORT)
     assert (!(current_parsed_root->isremote && check_edited));
-#else /* !CLIENT_SUPPORT */
-    assert (!check_edited);
 #endif /* CLIENT_SUPPORT */
 
     if (noexec)
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1111 ccvs/src/sanity.sh:1.1112
--- ccvs/src/sanity.sh:1.1111   Sat Feb 25 07:41:50 2006
+++ ccvs/src/sanity.sh  Sat Feb 25 19:39:53 2006
@@ -20155,7 +20155,7 @@
 
            # The warning is left over from the previous test.
            dotest config-5 "$testcvs -q ci -m set-HistoryLogPath" \
-"$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[98\]: unrecognized keyword 
\`BogusOption'
+"$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[0-9][0-9]*\]: unrecognized 
keyword \`BogusOption'
 $CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
 new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
 $SPROG commit: Rebuilding administrative file database"
@@ -30234,6 +30234,27 @@
  *-> Reader_Lock(${TESTDIR}/root2/sdir/ssdir)
  *-> Simple_Lock_Cleanup()
  *-> Lock_Cleanup()
+ *-> Simple_Lock_Cleanup()" \
+" *-> main: Session ID is ${commitid}
+ *-> main loop with CVSROOT=${TESTDIR}/root1
+ *-> parse_config ($TESTDIR/root1)
+ *-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null), 
(null), (null), (null), 1, (null))
+${CPROG} update: Updating \.
+ *-> Reader_Lock(${TESTDIR}/root1)
+ *-> Simple_Lock_Cleanup()
+${CPROG} update: Updating dir1
+ *-> Reader_Lock(${TESTDIR}/root1/dir1)
+ *-> Simple_Lock_Cleanup()
+ *-> main loop with CVSROOT=${TESTDIR}/root2
+ *-> parse_config ($TESTDIR/root2)
+ *-> do_update ((null), (null), (null), 1, 0, 0, 0, 0, 0, 3, (null), (null), 
(null), (null), (null), 1, (null))
+${CPROG} update: Updating dir1/sdir
+ *-> Reader_Lock(${TESTDIR}/root2/sdir)
+ *-> Simple_Lock_Cleanup()
+${CPROG} update: Updating dir1/sdir/ssdir
+ *-> Reader_Lock(${TESTDIR}/root2/sdir/ssdir)
+ *-> Simple_Lock_Cleanup()
+ *-> Lock_Cleanup()
  *-> Simple_Lock_Cleanup()"
          fi