[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2]
From: |
Derek Robert Price |
Subject: |
[Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2] |
Date: |
Tue, 29 Nov 2005 23:14:40 -0500 |
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1095.4.11 ccvs/src/sanity.sh:1.1095.4.12
--- ccvs/src/sanity.sh:1.1095.4.11 Wed Nov 30 04:01:34 2005
+++ ccvs/src/sanity.sh Wed Nov 30 04:14:38 2005
@@ -5389,7 +5389,8 @@
echo force a conflict >>tfile
dotest status-init-7 "$testcvs -q up" \
"Merging differences between 1\.1 and 1\.2 into \`tfile'
-cvs update: conflicts during merge"
+$CPROG update: conflicts during merge
+M tfile"
# Now note our status
dotest status-1 "${testcvs} status tfile" \
@@ -5606,7 +5607,7 @@
TRDIFF (branch: 1\.1\.1)"
cd ..
- rm -r trdiff
+ rm -rf trdiff
dotest rdiff-8 \
"${testcvs} rdiff -r T1 -r local-v0 trdiff" \
@@ -6243,7 +6244,7 @@
A file3"
# commit
- dotest deatch-89 "$testcvs -q ci -m test" \
+ dotest death-89 "$testcvs -q ci -m test" \
"$CVSROOT_DIRNAME/first-dir/file1,v <-- file1
new revision: 1\.4; previous revision: 1\.3
$CVSROOT_DIRNAME/first-dir/file2,v <-- file2
@@ -6257,7 +6258,7 @@
'U first-dir/file1
U first-dir/file3'
cd ..
- rm -r 2
+ rm -rf 2
cd first-dir
# remove first file.
@@ -6299,7 +6300,7 @@
dokeep
cd ..
- rm -r first-dir
+ rm -rf first-dir
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
;;
@@ -6642,7 +6643,7 @@
dokeep
cd ..
- rm -r first-dir
+ rm -rf first-dir
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
;;
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/07
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/18
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/22
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/28
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/29
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2],
Derek Robert Price <=
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/11/30