[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: |
Wed, 30 Nov 2005 15:25:41 -0500 |
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1095.4.15 ccvs/src/sanity.sh:1.1095.4.16
--- ccvs/src/sanity.sh:1.1095.4.15 Wed Nov 30 19:58:46 2005
+++ ccvs/src/sanity.sh Wed Nov 30 20:25:39 2005
@@ -9078,7 +9078,7 @@
dokeep
cd ..
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
- rm -r first-dir
+ rm -rf first-dir
;;
@@ -9276,10 +9276,9 @@
dotest import-113 \
"$testcvs -q co -jjunk-1_0 -jjunk-2_0 first-dir" \
"$SPROG checkout: file first-dir/imported-f1 does not exist, but is present in
revision junk-2_0
-Merging differences between 1\.1\.1\.1 and 1\.1\.1\.2 into \`imported-f2'
-$CPROG update: conflicts during merge
-first-dir/imported-f3 already contains the differences between 1\.1\.1\.1 and
1\.1\.1\.2
-first-dir/imported-f4 already contains the differences between 1\.1\.1\.1 and
1\.1\.1\.3"
+Merging differences between 1\.1\.1\.1 and 1\.1\.1\.2 into
\`first-dir/imported-f2'
+$CPROG checkout: conflicts during merge
+C first-dir/imported-f2"
cd first-dir
@@ -9407,7 +9406,7 @@
dokeep
cd ../..
- rm -r 1
+ rm -rf 1
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
$CVSROOT_DIRNAME/second-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, 2005/11/29
- [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 <=
- [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