[Cvs-cvs] ccvs/src ChangeLog sanity.sh tag.c [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/07 20:04:39

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

Log message:
        * tag.c (rtag_proc): Search the Attic when -F is used.
        * sanity.sh (tests): Run death-rtag.
        (death-rtag): Expect success.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.431&tr2=1.2336.2.432&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.192&tr2=1.752.2.193&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/tag.c.diff?only_with_tag=cvs1-11-x-branch&tr1=1.100.4.14&tr2=1.100.4.15&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.431 ccvs/src/ChangeLog:1.2336.2.432
--- ccvs/src/ChangeLog:1.2336.2.431     Tue Mar  7 18:59:37 2006
+++ ccvs/src/ChangeLog  Tue Mar  7 20:04:37 2006
@@ -1,5 +1,9 @@
 2006-03-07  Derek Price  <address@hidden>
 
+       * tag.c (rtag_proc): Search the Attic when -F is used.
+       * sanity.sh (tests): Run death-rtag.
+       (death-rtag): Expect success.
+
        * sanity.sh (death-rtag): Add failing force tag move test.
 
 2006-03-06  Derek Price  <address@hidden>
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.192 ccvs/src/sanity.sh:1.752.2.193
--- ccvs/src/sanity.sh:1.752.2.192      Tue Mar  7 18:59:38 2006
+++ ccvs/src/sanity.sh  Tue Mar  7 20:04:38 2006
@@ -1096,7 +1096,7 @@
        tests="${tests} status"
        # Branching, tagging, removing, adding, multiple directories
        tests="${tests} rdiff rdiff-short"
-       tests="${tests} rdiff2 diff diffnl death death2"
+       tests="${tests} rdiff2 diff diffnl death death2 death-rtag"
        tests="${tests} rm-update-message rmadd rmadd2 rmadd3 resurrection"
        tests="${tests} dirs dirs2 branches branches2 tagc tagf tag-space"
        tests="${tests} rcslib multibranch import importb importc import-CVS"
@@ -5805,7 +5805,7 @@
          # When the bug existed, `wonttag' would not have been present in
          # foo,v.
          #
-         # A second bug prevents `wontmove' from moving from the branch to
+         # A second bug prevented `wontmove' from moving from the branch to
          # the dead revision on the trunk (death-rtag-3.4 & death-rtag-3.5).
          dotest death-rtag-5 "$testcvs -q rlog death-rtag" \
 "
@@ -5828,7 +5828,7 @@
 access list:
 symbolic names:
        wonttag: 1\.1\.2\.1
-       wontmove: 1\.1\.2\.1
+       wontmove: 1\.2
        willtag: 1\.1
        mybranch: 1\.1.0\.2
 keyword substitution: kv
Index: ccvs/src/tag.c
diff -u ccvs/src/tag.c:1.100.4.14 ccvs/src/tag.c:1.100.4.15
--- ccvs/src/tag.c:1.100.4.14   Mon Mar  6 22:50:41 2006
+++ ccvs/src/tag.c      Tue Mar  7 20:04:39 2006
@@ -360,7 +360,7 @@
        }
        /* End section which is identical to patch_proc.  */
 
-       if (delete_flag || attic_too || numtag)
+       if (delete_flag || force_tag_move || attic_too || numtag)
            which = W_REPOS | W_ATTIC;
        else
            which = W_REPOS;