[Cvs-cvs] Changes to ccvs/src/sanity.sh

[Derek Robert Price]

Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1070 ccvs/src/sanity.sh:1.1071
--- ccvs/src/sanity.sh:1.1070   Thu Aug  4 01:04:32 2005
+++ ccvs/src/sanity.sh  Tue Aug  9 21:16:52 2005
@@ -2570,7 +2570,7 @@
 fi
 CVSROOT_DIRNAME=${TESTDIR}/cvsroot
 CVSROOT=`newroot $CVSROOT_DIRNAME`; export CVSROOT
-echo CVSROOT: ${CVSROOT}
+
 
 
 ###
@@ -16961,6 +16961,8 @@
          modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
          ;;
 
+
+
        watch6-0)
 
          # Make sure that default attributes are being set properly.
@@ -17000,16 +17002,14 @@
          dotest watch6-0-13 "grep -qE '^D' 
$CVSROOT_DIRNAME/watch6-0/dir2/CVS/fileattr"
          dotest_fail watch6-0-12 "grep -qE '^D' 
$CVSROOT_DIRNAME/watch6-0/dir3/CVS/fileattr 2>/dev/null"
 
-         if $keep; then
-           echo Keeping $TESTDIR and exiting due to --keep
-           exit 0
-         fi
+         dokeep
          cd ../../..
-         rm -rf watch6
-         rm -rf $CVSROOT_DIRNAME/watch6
-
+         rm -rf watch6-0
+         modify_repo rm -rf $CVSROOT_DIRNAME/watch6-0
          ;;
 
+
+
        watch6)
          # Check that `cvs watch on' does not reset the fileattr file.
          mkdir watch6; cd watch6
@@ -17088,7 +17088,7 @@
          fi
          cd ../../..
          rm -r watch6
-         rm -rf $CVSROOT_DIRNAME/watch6
+         modify_repo rm -rf $CVSROOT_DIRNAME/watch6
          ;;