[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh |
Date: |
Tue, 23 May 2006 01:09:09 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch:
Changes by: Derek Robert Price <address@hidden> 06/05/23 01:09:09
Modified files:
src : ChangeLog sanity.sh
Log message:
Merge changes from 1.11.x.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3423&tr2=1.3424&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1140&tr2=1.1141&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3423 ccvs/src/ChangeLog:1.3424
--- ccvs/src/ChangeLog:1.3423 Mon May 22 19:17:39 2006
+++ ccvs/src/ChangeLog Tue May 23 01:09:08 2006
@@ -1,5 +1,9 @@
2006-05-22 Derek Price <address@hidden>
+ * sanity.sh (rcs6): New test.
+
+2006-05-22 Derek Price <address@hidden>
+
* rcscmds.c (RCS_output_diff_options): Always output the file name on a
diff line, even with two -r options, so that the file path is available
in a multiple file diff, even without -c or -u.
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1140 ccvs/src/sanity.sh:1.1141
--- ccvs/src/sanity.sh:1.1140 Mon May 22 19:17:39 2006
+++ ccvs/src/sanity.sh Tue May 23 01:09:08 2006
@@ -1995,7 +1995,7 @@
tests="${tests} serverpatch log log2 logopt ann ann-id"
# Repository Storage (RCS file format, CVS lock files, creating
# a repository without "cvs init", &c).
- tests="${tests} crerepos rcs rcs2 rcs3 rcs4 rcs5"
+ tests="${tests} crerepos rcs rcs2 rcs3 rcs4 rcs5 rcs6"
tests="$tests lockfiles backuprecover"
tests="${tests} sshstdio"
# More history browsing, &c.
@@ -23327,6 +23327,8 @@
rcs6)
+ # FIXCVS - The following comment should apply after this is fixed:
+ #
# Test that CVS notices a specific type of corruption in the RCS
# archive. In the past, this type of corruption had turned up after
# a user ineptly attempted to delete a revision from an arcvhive
@@ -23377,8 +23379,12 @@
new revision: 1\.2; previous revision: 1\.1
done"
+ # Can still tag.
+ dotest rcs6-4 "$testcvs -q tag -F current" "T cfile"
+
# This finally reports the corruption.
- dotest rcs6-4 "$testcvs -q tag -F current"
+ dotest_fail rcs6-5 "$testcvs -q up -r1.1 cfile" \
+"$SPROG \[update aborted\]: invalid change text in
$CVSROOT_DIRNAME/rcs6/cfile,v"
if $keep; then
echo Keeping $TESTDIR and exiting due to --keep
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/05/01
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/05/01
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/05/01
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh,
Derek Robert Price <=
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Larry Jones, 2006/05/24
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Larry Jones, 2006/05/25
- [Cvs-cvs] ccvs/src ChangeLog sanity.sh, Derek Robert Price, 2006/05/26