[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         cvs1-11-x-branch
Changes by:     Derek Robert Price <address@hidden>     06/03/06 22:32:08

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        * sanity.sh (death-rtag): New test.
        (Original report from C. Michael Pilato <address@hidden>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.428&tr2=1.2336.2.429&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=cvs1-11-x-branch&tr1=1.752.2.189&tr2=1.752.2.190&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.428 ccvs/src/ChangeLog:1.2336.2.429
--- ccvs/src/ChangeLog:1.2336.2.428     Wed Mar  1 22:04:26 2006
+++ ccvs/src/ChangeLog  Mon Mar  6 22:32:06 2006
@@ -1,3 +1,8 @@
+2006-03-06  Derek Price  <address@hidden>
+
+       * sanity.sh (death-rtag): New test.
+       (Original report from C. Michael Pilato <address@hidden>.)
+
 2006-03-01  Derek Price  <address@hidden>
 
        * sanity.sh: Set MALLOC_CHECK_ in hopes of exposing common memory
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.189 ccvs/src/sanity.sh:1.752.2.190
--- ccvs/src/sanity.sh:1.752.2.189      Wed Mar  1 22:04:26 2006
+++ ccvs/src/sanity.sh  Mon Mar  6 22:32:06 2006
@@ -5748,6 +5748,80 @@
          cd .. ; rm -rf first-dir ${CVSROOT_DIRNAME}/first-dir
          ;;
 
+
+
+       death-rtag)
+         # This documents a bug in CVS that prevents rtag from tagging files
+         # in the Attic.
+         mkdir $CVSROOT_DIRNAME/death-rtag
+         dotest death-rtag-init-1 "$testcvs -Q co death-rtag"
+         cd death-rtag
+         echo "This is the file foo" > foo
+         echo "This is the file bar" > bar
+         dotest death-rtag-init-2 "$testcvs -Q add foo bar"
+         dotest death-rtag-init-3 "$testcvs -Q ci -m 'Add foo and bar.'" \
+"RCS file: $CVSROOT_DIRNAME/death-rtag/bar,v
+done
+Checking in bar;
+$CVSROOT_DIRNAME/death-rtag/bar,v  <--  bar
+initial revision: 1\.[0-9]*
+done
+RCS file: $CVSROOT_DIRNAME/death-rtag/foo,v
+done
+Checking in foo;
+$CVSROOT_DIRNAME/death-rtag/foo,v  <--  foo
+initial revision: 1\.[0-9]*
+done"
+         dotest death-rtag-init-5 "$testcvs -Q tag -b mybranch"
+
+         dotest death-rtag-1 "$testcvs -q rtag -frmybranch willtag death-rtag"
+         dotest death-rtag-2 "$testcvs -Q rm -f foo"
+         dotest death-rtag-3 "$testcvs -Q ci -m 'Remove foo.'" \
+"Removing foo;
+$CVSROOT_DIRNAME/death-rtag/foo,v  <--  foo
+new revision: delete; previous revision: 1\.[0-9]*
+done"
+         cd ..
+
+         # Removing -f below avoids this bug.
+         dotest death-rtag-4 "$testcvs -q rtag -frmybranch wonttag death-rtag"
+
+         # FIXCVS: <wheresthebeeflady>Where's the tag?!?!</wheresthebeeflady>
+         dotest death-rtag-5 "$testcvs -q rlog death-rtag" \
+"
+RCS file: $CVSROOT_DIRNAME/death-rtag/bar,v
+head: 1.[0-9]*
+branch:
+locks: strict
+access list:
+symbolic names:
+       wonttag: 1\.1
+       willtag: 1\.1
+       mybranch: 1\.1.0\.2
+keyword substitution: kv
+$DOTSTAR
+RCS file: $CVSROOT_DIRNAME/death-rtag/Attic/foo,v
+head: 1.[0-9]*
+branch:
+locks: strict
+access list:
+symbolic names:
+       willtag: 1\.1
+       mybranch: 1\.1.0\.2
+keyword substitution: kv
+$DOTSTAR"
+
+         if $keep; then
+           echo Keeping $TESTDIR and exiting due to --keep
+           exit 0
+         fi
+
+         rm -r death-rtag
+         rm -rf $CVSROOT_DIRNAME/death-rtag
+         ;;
+
+
+
        rm-update-message)
          # FIXME
          # local CVS prints a warning message when update notices a missing