[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: |
Thu, 01 Dec 2005 08:49:59 -0500 |
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1095.4.20 ccvs/src/sanity.sh:1.1095.4.21
--- ccvs/src/sanity.sh:1.1095.4.20 Thu Dec 1 03:37:49 2005
+++ ccvs/src/sanity.sh Thu Dec 1 13:49:56 2005
@@ -16927,10 +16927,9 @@
new revision: 1\.2; previous revision: 1\.1"
cd ../..
cd 2/first-dir
- dotest watch4-13 "${testcvs} -q update" \
+ dotest watch4-13 "$testcvs -q update" \
"Merging differences between 1\.1 and 1\.2 into file1
-rcsmerge: warning: conflicts during merge
-${SPROG} update: conflicts found in file1
+$CPROG update: conflicts during merge
C file1"
if (echo yes | ${testcvs} unedit file1) >>${LOGFILE}; then
pass watch4-14
- [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/12/01
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/01
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/01
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/02
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/02
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/05
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/05
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/06
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/08
- [Cvs-cvs] Changes to ccvs/src/sanity.sh [signed-commits2], Derek Robert Price, 2005/12/08