18054 |
|
|
18055 |
# Check that the contents were right. This isn't the hard case |
# Check that the contents were right. This isn't the hard case |
18056 |
# (in which RCS_delete_revs does a diff), but might as well. |
# (in which RCS_delete_revs does a diff), but might as well. |
18057 |
if $remote; then |
if $remote && test -z "$CVSNOBASES"; then |
18058 |
dotest_fail binfiles-o4r "$testcvs -q update binfile" \ |
dotest_fail binfiles-o4r "$testcvs -q update binfile" \ |
18059 |
"$SPROG \[update aborted\]: could not find desired version 1\.5 in $CVSROOT_DIRNAME/first-dir/binfile,v" |
"$SPROG \[update aborted\]: could not find desired version 1\.5 in $CVSROOT_DIRNAME/first-dir/binfile,v" |
18060 |
else |
else |
20465 |
# Now update the second copy. When using remote CVS, the |
# Now update the second copy. When using remote CVS, the |
20466 |
# patch will fail, forcing the file to be refetched. |
# patch will fail, forcing the file to be refetched. |
20467 |
cd ../../2/first-dir |
cd ../../2/first-dir |
20468 |
dotest serverpatch-8 "${testcvs} -q update" \ |
dotest serverpatch-8 "$testcvs -q update" \ |
20469 |
'U file1' \ |
'U file1' \ |
20470 |
"P file1 |
"P file1 |
20471 |
${CPROG} update: checksum failure after patch to \./file1; will refetch |
$CPROG update: checksum failure after patch to file1; will refetch |
20472 |
${CPROG} client: refetching unpatchable files |
$CPROG client: refetching unpatchable files |
20473 |
$SPROG update: warning: \`file1' was lost |
$SPROG update: warning: \`file1' was lost |
20474 |
U file1" |
U file1" |
20475 |
|
|
23276 |
# |
# |
23277 |
# Feel free to imagine the horrific scream of despair |
# Feel free to imagine the horrific scream of despair |
23278 |
cd ../../1/first-dir |
cd ../../1/first-dir |
23279 |
if $remote; then |
if $remote && test -z "$CVSNOBASES"; then |
23280 |
# FIXCVS |
# FIXCVS |
23281 |
# See the note above about lost data and a few other comments in |
# See the note above about lost data and a few other comments in |
23282 |
# other tests. At least with base files, no data is lost, but this |
# other tests. At least with base files, no data is lost, but this |
23865 |
cd ../.. |
cd ../.. |
23866 |
# Restore umask. |
# Restore umask. |
23867 |
umask $save_umask |
umask $save_umask |
23868 |
|
unset CVSUMASK |
23869 |
rm -r 1 |
rm -r 1 |
23870 |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
23871 |
;; |
;; |