[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch] |
Date: |
Tue, 07 Mar 2006 18:59:41 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Derek Robert Price <address@hidden> 06/03/07 18:59:39
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh (death-rtag): Add failing force tag move test.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.430&tr2=1.2336.2.431&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.191&tr2=1.752.2.192&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.430 ccvs/src/ChangeLog:1.2336.2.431
--- ccvs/src/ChangeLog:1.2336.2.430 Mon Mar 6 22:50:40 2006
+++ ccvs/src/ChangeLog Tue Mar 7 18:59:37 2006
@@ -1,3 +1,7 @@
+2006-03-07 Derek Price <address@hidden>
+
+ * 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.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.191 ccvs/src/sanity.sh:1.752.2.192
--- ccvs/src/sanity.sh:1.752.2.191 Mon Mar 6 22:50:40 2006
+++ ccvs/src/sanity.sh Tue Mar 7 18:59:38 2006
@@ -5774,20 +5774,39 @@
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-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.'" \
"Removing foo;
$CVSROOT_DIRNAME/death-rtag/foo,v <-- foo
new revision: delete; previous revision: 1\.[0-9]*
done"
- cd ..
+ # 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.'" \
+"Checking in bar;
+$CVSROOT_DIRNAME/death-rtag/bar,v <-- bar
+new revision: 1\.1\.2\.1; previous revision: 1\.1
+done
+Checking in foo;
+$CVSROOT_DIRNAME/death-rtag/Attic/foo,v <-- foo
+new revision: 1\.1\.2\.1; previous revision: 1\.1
+done"
+ 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 prevents `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
@@ -5796,7 +5815,8 @@
locks: strict
access list:
symbolic names:
- wonttag: 1\.1
+ wonttag: 1\.1\.2\.1
+ wontmove: 1\.1
willtag: 1\.1
mybranch: 1\.1.0\.2
keyword substitution: kv
@@ -5807,7 +5827,8 @@
locks: strict
access list:
symbolic names:
- wonttag: 1\.1
+ wonttag: 1\.1\.2\.1
+ wontmove: 1\.1\.2\.1
willtag: 1\.1
mybranch: 1\.1.0\.2
keyword substitution: kv