[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/06 22:50:41

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

Log message:
        * tag.c (rtag_proc): Always search in the attic when -r is used.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.429&tr2=1.2336.2.430&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.190&tr2=1.752.2.191&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.13&tr2=1.100.4.14&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.429 ccvs/src/ChangeLog:1.2336.2.430
--- ccvs/src/ChangeLog:1.2336.2.429     Mon Mar  6 22:32:06 2006
+++ ccvs/src/ChangeLog  Mon Mar  6 22:50:40 2006
@@ -1,5 +1,7 @@
 2006-03-06  Derek Price  <address@hidden>
 
+       * tag.c (rtag_proc): Always search in the attic when -r is used.
+
        * sanity.sh (death-rtag): New test.
        (Original report from C. Michael Pilato <address@hidden>.)
 
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.190 ccvs/src/sanity.sh:1.752.2.191
--- ccvs/src/sanity.sh:1.752.2.190      Mon Mar  6 22:32:06 2006
+++ ccvs/src/sanity.sh  Mon Mar  6 22:50:40 2006
@@ -5786,7 +5786,8 @@
          # Removing -f below avoids this bug.
          dotest death-rtag-4 "$testcvs -q rtag -frmybranch wonttag death-rtag"
 
-         # FIXCVS: <wheresthebeeflady>Where's the tag?!?!</wheresthebeeflady>
+         # When the bug existed, `wonttag' would not have been present in
+         # foo,v.
          dotest death-rtag-5 "$testcvs -q rlog death-rtag" \
 "
 RCS file: $CVSROOT_DIRNAME/death-rtag/bar,v
@@ -5806,6 +5807,7 @@
 locks: strict
 access list:
 symbolic names:
+       wonttag: 1\.1
        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.13 ccvs/src/tag.c:1.100.4.14
--- ccvs/src/tag.c:1.100.4.13   Wed Feb  1 21:27:03 2006
+++ ccvs/src/tag.c      Mon Mar  6 22:50:41 2006
@@ -360,7 +360,7 @@
        }
        /* End section which is identical to patch_proc.  */
 
-       if (delete_flag || attic_too || (force_tag_match && numtag))
+       if (delete_flag || attic_too || numtag)
            which = W_REPOS | W_ATTIC;
        else
            which = W_REPOS;