[Cvs-cvs] ccvs ./ChangeLog ./NEWS src/ChangeLog src/sanit...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/03/10 16:29:34

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

Log message:
        Merge changes from 1.11.x.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/ChangeLog.diff?tr1=1.1277&tr2=1.1278&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/NEWS.diff?tr1=1.350&tr2=1.351&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3357&tr2=1.3358&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1119&tr2=1.1120&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/tag.c.diff?tr1=1.143&tr2=1.144&r1=text&r2=text

Patches:
Index: ccvs/ChangeLog
diff -u ccvs/ChangeLog:1.1277 ccvs/ChangeLog:1.1278
--- ccvs/ChangeLog:1.1277       Sun Feb 26 21:42:48 2006
+++ ccvs/ChangeLog      Fri Mar 10 16:29:34 2006
@@ -1,3 +1,7 @@
+2006-03-07  Derek Price  <address@hidden>
+
+       * NEWS: Note rtag fixes.
+
 2006-02-26  Derek Price  <address@hidden>
 
        * NEWS: Note CVSADM fix as an efficiency improvement.
Index: ccvs/NEWS
diff -u ccvs/NEWS:1.350 ccvs/NEWS:1.351
--- ccvs/NEWS:1.350     Sun Feb 26 21:42:48 2006
+++ ccvs/NEWS   Fri Mar 10 16:29:34 2006
@@ -14,6 +14,8 @@
 
 BUG FIXES
 
+* `cvs rtag' now correctly tags files that have been removed from the trunk.
+
 * Code efficiency has been improved slightly.
 
 * A rare race condition that could leave a lock on the val-tags file has been
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3357 ccvs/src/ChangeLog:1.3358
--- ccvs/src/ChangeLog:1.3357   Fri Mar 10 12:56:07 2006
+++ ccvs/src/ChangeLog  Fri Mar 10 16:29:34 2006
@@ -1,3 +1,18 @@
+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>
+
+       * 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>.)
+
 2006-03-10  Derek Price  <address@hidden>
 
        * rcs.c (rcsbuf_cache_open): Extend FIXME.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1119 ccvs/src/sanity.sh:1.1120
--- ccvs/src/sanity.sh:1.1119   Wed Mar  1 22:05:15 2006
+++ ccvs/src/sanity.sh  Fri Mar 10 16:29:34 2006
@@ -1720,7 +1720,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 branches3"
        tests="${tests} branches4 tagc tagf tag-space"
@@ -6660,6 +6660,77 @@
 
 
 
+       death-rtag)
+         # This documents a bug in CVS that prevents rtag from tagging files
+         # in the Attic.
+         modify_repo 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.'"
+         dotest death-rtag-init-5 "$testcvs -Q tag -b mybranch"
+
+         dotest death-rtag-1 "$testcvs -q rtag -rmybranch willtag death-rtag"
+         dotest death-rtag-2 "$testcvs -Q rm -f foo"
+         dotest death-rtag-3 "$testcvs -Q ci -m 'Remove foo.'"
+         # commit something on the branch so that the moving tag is visible.
+         dotest death-rtag-3.2 "$testcvs -Q up -rmybranch"
+         echo some branch content >>foo
+         echo some branch content >>bar
+         dotest death-rtag-3.3 "$testcvs -Q ci -m 'Change foo.'"
+         dotest death-rtag-3.4 \
+"$testcvs -q rtag -rmybranch wontmove death-rtag"
+         dotest death-rtag-3.5 "$testcvs -q rtag -F wontmove death-rtag"
+
+         cd ..
+         # Removing -f below avoids this bug.
+         dotest death-rtag-4 "$testcvs -q rtag -frmybranch wonttag death-rtag"
+
+         # When the bug existed, `wonttag' would not have been present in
+         # foo,v.
+         #
+         # 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" \
+"
+RCS file: $CVSROOT_DIRNAME/death-rtag/bar,v
+head: 1.[0-9]*
+branch:
+locks: strict
+access list:
+symbolic names:
+       wonttag: 1\.1\.2\.1
+       wontmove: 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:
+       wonttag: 1\.1\.2\.1
+       wontmove: 1\.2
+       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
+         modify_repo rm -rf $CVSROOT_DIRNAME/death-rtag
+         ;;
+
+
+
        rm-update-message)
          # FIXME
          # local CVS prints a warning message when update notices a missing
Index: ccvs/src/tag.c
diff -u ccvs/src/tag.c:1.143 ccvs/src/tag.c:1.144
--- ccvs/src/tag.c:1.143        Thu Feb  2 13:13:02 2006
+++ ccvs/src/tag.c      Fri Mar 10 16:29:34 2006
@@ -492,7 +492,7 @@
        }
        /* End section which is identical to patch_proc.  */
 
-       if (delete_flag || attic_too || (force_tag_match && numtag))
+       if (delete_flag || force_tag_move || attic_too || numtag)
            which = W_REPOS | W_ATTIC;
        else
            which = W_REPOS;