7227 |
${CPROG} update: move away \`sdir/file1'; it is in the way |
${CPROG} update: move away \`sdir/file1'; it is in the way |
7228 |
C sdir/file1" |
C sdir/file1" |
7229 |
rm sdir/file1 |
rm sdir/file1 |
7230 |
rm -r sdir/CVS |
rm -rf sdir/CVS |
7231 |
|
|
7232 |
# This is where things are not just like conflicts3-23 |
# This is where things are not just like conflicts3-23 |
7233 |
dotest dirs2-7r "${testcvs} update -d" \ |
dotest dirs2-7r "${testcvs} update -d" \ |
7251 |
dotest dirs2-8 "${testcvs} -q co first-dir" 'U first-dir/sdir/file1' |
dotest dirs2-8 "${testcvs} -q co first-dir" 'U first-dir/sdir/file1' |
7252 |
cd first-dir |
cd first-dir |
7253 |
dotest dirs2-9 "${testcvs} -q tag -b br" "T sdir/file1" |
dotest dirs2-9 "${testcvs} -q tag -b br" "T sdir/file1" |
7254 |
rm -r sdir/CVS |
rm -rf sdir/CVS |
7255 |
|
|
7256 |
if $remote; then |
if $remote; then |
7257 |
# val-tags used to have a cute little quirk; if an update didn't |
# val-tags used to have a cute little quirk; if an update didn't |
7294 |
new revision: delete; previous revision: 1\.1" |
new revision: delete; previous revision: 1\.1" |
7295 |
cd ../../2/first-dir |
cd ../../2/first-dir |
7296 |
if $remote; then |
if $remote; then |
7297 |
dotest dirs2-14 "${testcvs} update -d -r br" \ |
dotest dirs2-14r "${testcvs} update -d -r br" \ |
7298 |
"${QUESTION} sdir/file1 |
"${QUESTION} sdir/file1 |
7299 |
${SPROG} update: Updating \. |
${SPROG} update: Updating \. |
7300 |
${SPROG} update: Updating sdir" |
${SPROG} update: Updating sdir" |
7306 |
|
|
7307 |
dokeep |
dokeep |
7308 |
cd ../.. |
cd ../.. |
7309 |
rm -r 1 2 3 |
rm -rf 1 2 3 |
7310 |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
7311 |
;; |
;; |
7312 |
|
|
7503 |
dokeep |
dokeep |
7504 |
cd .. |
cd .. |
7505 |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
7506 |
rm -r first-dir |
rm -rf first-dir |
7507 |
;; |
;; |
7508 |
|
|
7509 |
|
|
7796 |
# tacky, although people generally expect it to work. Maybe |
# tacky, although people generally expect it to work. Maybe |
7797 |
# we should release it instead. We do it a few other places |
# we should release it instead. We do it a few other places |
7798 |
# below as well. |
# below as well. |
7799 |
rm -r dir1 |
rm -rf dir1 |
7800 |
dotest branches2-15 "${testcvs} update -d -j b1 dir1" \ |
dotest branches2-15 "${testcvs} update -d -j b1 dir1" \ |
7801 |
"${SPROG} update: Updating dir1 |
"${SPROG} update: Updating dir1 |
7802 |
U dir1/file3" |
U dir1/file3" |