[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 10:12:33 -0500 |
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1095.4.13 ccvs/src/sanity.sh:1.1095.4.14
--- ccvs/src/sanity.sh:1.1095.4.13 Wed Nov 30 05:04:14 2005
+++ ccvs/src/sanity.sh Wed Nov 30 15:12:30 2005
@@ -7797,9 +7797,10 @@
# we should release it instead. We do it a few other places
# below as well.
rm -rf dir1
- dotest branches2-15 "${testcvs} update -d -j b1 dir1" \
-"${SPROG} update: Updating dir1
-U dir1/file3"
+ dotest branches2-15 "$testcvs update -d -j b1 dir1" \
+"$SPROG update: Updating dir1
+$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`dir1/file3'\."
+
# FIXCVS: The `No revision control file' stuff seems to be
# CVS's way of telling us that we're adding the file on a
# branch, and the file is not on that branch yet. This
@@ -7852,10 +7853,10 @@
Sticky Date: (none)
Sticky Options: (none)"
- rm -r dir1
- dotest branches2-21 "${testcvs} update -d -P -j b1 dir1" \
-"${SPROG} update: Updating dir1
-U dir1/file3"
+ rm -rf dir1
+ dotest branches2-21 "$testcvs update -d -P -j b1 dir1" \
+"$SPROG update: Updating dir1
+$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`dir1/file3'\."
dotest branches2-22 "${testcvs} -q status" \
"===================================================================
File: file1 Status: Up-to-date
@@ -7878,7 +7879,7 @@
Sticky Options: (none)"
cd ../..
- rm -r b1 b2
+ rm -rf b1 b2
# Check out branch b1 twice. Crate a new directory in one
# working directory, then do a cvs update in the other
@@ -7927,7 +7928,7 @@
# Test update -A on a subdirectory
cd ..
- rm -r dir2
+ rm -rf dir2
dotest branches2-31 "${testcvs} update -A -d dir2" \
"${SPROG} update: Updating dir2"
cd dir2
@@ -7975,7 +7976,7 @@
dokeep
cd ../../..
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
- rm -r trunk b1a b1b
+ rm -rf trunk b1a b1b
;;
@@ -8184,7 +8185,7 @@
dokeep
cd ../..
- rm -r 1 2
+ rm -rf 1 2
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, 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 <=
- [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