3311 |
cd .. |
cd .. |
3312 |
rm -r 1 |
rm -r 1 |
3313 |
mkdir 2; cd 2 |
mkdir 2; cd 2 |
3314 |
|
#export CVS_CLIENT_LOG=/tmp/cvsgpglog |
3315 |
dotest basicb-0d "${testcvs} -q co -l ." "U topfile" |
dotest basicb-0d "${testcvs} -q co -l ." "U topfile" |
3316 |
|
#exit |
3317 |
# Now test the ability to run checkout on an existing working |
# Now test the ability to run checkout on an existing working |
3318 |
# directory without having it lose its mind. I don't know |
# directory without having it lose its mind. I don't know |
3319 |
# whether this is tested elsewhere in sanity.sh. A more elaborate |
# whether this is tested elsewhere in sanity.sh. A more elaborate |
3320 |
# test might also have modified files, make sure it works if |
# test might also have modified files, make sure it works if |
3321 |
# the modules file was modified to add new directories to the |
# the modules file was modified to add new directories to the |
3322 |
# module, and such. |
# module, and such. |
3323 |
|
#export CVS_CLIENT_LOG=/tmp/cvsgpglog |
3324 |
dotest basicb-0d0 "${testcvs} -q co -l ." "" |
dotest basicb-0d0 "${testcvs} -q co -l ." "" |
3325 |
mkdir first-dir |
mkdir first-dir |
3326 |
dotest basicb-0e "${testcvs} add first-dir" \ |
dotest basicb-0e "${testcvs} add first-dir" \ |
7181 |
dotest_sort resurrection-14 "$testcvs -r add file1" \ |
dotest_sort resurrection-14 "$testcvs -r add file1" \ |
7182 |
"U file1 |
"U file1 |
7183 |
$SPROG add: \`file1', version 1\.3, resurrected" |
$SPROG add: \`file1', version 1\.3, resurrected" |
7184 |
dotest_fail resurrection-15 'test -w file1' '' |
export CVS_CLIENT_LOG=/tmp/cvsclientlog |
7185 |
|
dotest_fail resurrection-15 'test -w file1' |
7186 |
|
|
7187 |
dokeep |
dokeep |
7188 |
cd ../.. |
cd ../.. |
16652 |
dotest_fail devcom-9b "test -w abc" |
dotest_fail devcom-9b "test -w abc" |
16653 |
|
|
16654 |
dotest devcom-10 "$testcvs editors" |
dotest devcom-10 "$testcvs editors" |
16655 |
dotest devcom-11 "$testcvs edit abb" |
dotest devcom-11 "$testcvs -q edit abb" |
16656 |
|
|
16657 |
# Here we test for the traditional ISO C ctime() date format. |
# Here we test for the traditional ISO C ctime() date format. |
16658 |
# We assume the C locale; I guess that works provided we set |
# We assume the C locale; I guess that works provided we set |
16674 |
|
|
16675 |
dotest_fail devcom-16 "test -w abb" |
dotest_fail devcom-16 "test -w abb" |
16676 |
|
|
16677 |
dotest devcom-17 "$testcvs edit abc" |
dotest devcom-17 "$testcvs -q edit abc" |
16678 |
|
|
16679 |
# Unedit of an unmodified file. |
# Unedit of an unmodified file. |
16680 |
dotest devcom-18 "$testcvs unedit abc" |
dotest devcom-18 "$testcvs unedit abc" |
16681 |
dotest devcom-19 "$testcvs edit abc" |
dotest devcom-19 "$testcvs -q edit abc" |
16682 |
|
|
16683 |
echo changedabc >abc |
echo changedabc >abc |
16684 |
# Try to unedit a modified file; cvs should ask for confirmation |
# Try to unedit a modified file; cvs should ask for confirmation |
17061 |
dotest_fail watch4-8 "test -w first-dir/file1" '' |
dotest_fail watch4-8 "test -w first-dir/file1" '' |
17062 |
dotest_fail watch4-9 "test -w first-dir/subdir/sfile" '' |
dotest_fail watch4-9 "test -w first-dir/subdir/sfile" '' |
17063 |
cd first-dir |
cd first-dir |
17064 |
dotest watch4-10 "${testcvs} edit file1" '' |
dotest watch4-10 "$testcvs -q edit file1" |
17065 |
echo 'edited in 2' >file1 |
echo 'edited in 2' >file1 |
17066 |
cd ../.. |
cd ../.. |
17067 |
|
|
17071 |
# to maintain partial compatibility with CVS versions |
# to maintain partial compatibility with CVS versions |
17072 |
# prior to the edit check patch. |
# prior to the edit check patch. |
17073 |
editorsLineRE="file1 $username [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR/2/first-dir" |
editorsLineRE="file1 $username [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR/2/first-dir" |
17074 |
dotest watch4-11 "$testcvs edit file1" "$editorsLineRE" |
dotest watch4-11 "$testcvs -q edit file1" |
17075 |
|
|
17076 |
echo 'edited in 1' >file1 |
echo 'edited in 1' >file1 |
17077 |
dotest watch4-12 "${testcvs} -q ci -m edit-in-1" \ |
dotest watch4-12 "${testcvs} -q ci -m edit-in-1" \ |
17148 |
dotest watch5-3 "${testcvs} -q ci -m add" \ |
dotest watch5-3 "${testcvs} -q ci -m add" \ |
17149 |
"$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
"$CVSROOT_DIRNAME/first-dir/file1,v <-- file1 |
17150 |
initial revision: 1\.1" |
initial revision: 1\.1" |
17151 |
dotest watch5-4 "${testcvs} edit file1" '' |
dotest watch5-4 "$testcvs -q edit file1" |
17152 |
dotest watch5-5 "test -f CVS/Base/file1" '' |
dotest watch5-5 "test -f CVS/Base/file1" '' |
17153 |
if ${testcvs} status file1 >>${LOGFILE} 2>&1; then |
if ${testcvs} status file1 >>${LOGFILE} 2>&1; then |
17154 |
pass watch5-6 |
pass watch5-6 |
17352 |
|
|
17353 |
NF_editorsLineRE=" [-a-zA-Z0-9_]* [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR/edit-check/first-dir" |
NF_editorsLineRE=" [-a-zA-Z0-9_]* [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR/edit-check/first-dir" |
17354 |
|
|
17355 |
dotest edit-check-3 "$testcvs edit file1" |
dotest edit-check-3 "$testcvs -q edit file1" |
17356 |
dotest edit-check-4 "$testcvs edit file1" "$editorsLineRE" |
dotest edit-check-4 "$testcvs -q edit file1" |
17357 |
|
|
17358 |
dotest_fail edit-check-5a "$testcvs edit -c file1" \ |
dotest_fail edit-check-5a "$testcvs edit -c file1" \ |
17359 |
"$editorsLineRE |
"$editorsLineRE |
17361 |
|
|
17362 |
dotest edit-check-5b "$testcvs editors" "$editorsLineRE" |
dotest edit-check-5b "$testcvs editors" "$editorsLineRE" |
17363 |
|
|
17364 |
dotest edit-check-6a "$testcvs edit -c -f file1" "$editorsLineRE" |
dotest edit-check-6a "$testcvs -q edit -c -f file1" |
17365 |
dotest edit-check-6b "$testcvs editors" "$editorsLineRE" |
dotest edit-check-6b "$testcvs editors" "$editorsLineRE" |
17366 |
|
|
17367 |
dotest edit-check-7a "cat file1" "foo" |
dotest edit-check-7a "cat file1" "foo" |
17394 |
dotest edit-check-9b "$testcvs editors" |
dotest edit-check-9b "$testcvs editors" |
17395 |
dotest edit-check-9c "cat file1" "foo" |
dotest edit-check-9c "cat file1" "foo" |
17396 |
|
|
17397 |
dotest edit-check-10 "$testcvs edit -c file1" |
dotest edit-check-10 "$testcvs -q edit -c file1" |
17398 |
dotest_fail edit-check-11 "$testcvs edit -c file1" \ |
dotest_fail edit-check-11 "$testcvs -q edit -c file1" \ |
17399 |
"$editorsLineRE |
"$SPROG edit: Skipping file \`file1' due to existing editors\." |
|
$SPROG edit: Skipping file \`file1' due to existing editors\." |
|
17400 |
|
|
17401 |
echo "morefoo" > file1 |
echo "morefoo" > file1 |
17402 |
dotest edit-check-12a "$testcvs commit -m 'c2' -c file1" \ |
dotest edit-check-12a "$testcvs commit -m 'c2' -c file1" \ |
17416 |
new revision: 1\.3; previous revision: 1\.2" |
new revision: 1\.3; previous revision: 1\.2" |
17417 |
dotest edit-check-14b "$testcvs editors file1" |
dotest edit-check-14b "$testcvs editors file1" |
17418 |
|
|
17419 |
dotest edit-check-15 "$testcvs edit -c file1" |
dotest edit-check-15 "$testcvs -q edit -c file1" |
17420 |
cd .. |
cd .. |
17421 |
|
|
17422 |
dotest edit-check-16a "echo yes | $testcvs release -d first-dir" \ |
dotest edit-check-16a "echo yes | $testcvs release -d first-dir" \ |
17428 |
dotest edit-check-16c "$testcvs editors file1" |
dotest edit-check-16c "$testcvs editors file1" |
17429 |
|
|
17430 |
cd .. |
cd .. |
17431 |
dotest edit-check-17a "$testcvs edit -c" |
dotest edit-check-17a "$testcvs -q edit -c" |
17432 |
dotest_fail edit-check-17b "$testcvs edit -c" \ |
dotest_fail edit-check-17b "$testcvs -q edit -c" \ |
17433 |
"$R_editorsLineRE |
"$SPROG edit: Skipping file \`first-dir/file1' due to existing editors\." |
17434 |
$SPROG edit: Skipping file \`first-dir/file1' due to existing editors\." |
dotest edit-check-17c "$testcvs -q edit -c -f" |
|
dotest edit-check-17c "$testcvs edit -c -f" "$R_editorsLineRE" |
|
17435 |
|
|
17436 |
echo "more changes" > first-dir/file1 |
echo "more changes" > first-dir/file1 |
17437 |
dotest edit-check-18a "$testcvs -q commit -m 'c5' -c" \ |
dotest edit-check-18a "$testcvs -q commit -m 'c5' -c" \ |
17467 |
|
|
17468 |
O_editorsLineRE="file1 $otherUser [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR[0-9]/edit-check/first-dir" |
O_editorsLineRE="file1 $otherUser [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR[0-9]/edit-check/first-dir" |
17469 |
|
|
17470 |
dotest edit-check-19a "$testcvs edit file1" "$O_editorsLineRE" |
dotest edit-check-19a "$testcvs -q edit file1" |
17471 |
dotest edit-check-19b "$testcvs editors" \ |
dotest edit-check-19b "$testcvs editors" \ |
17472 |
"$A_editorsLineRE |
"$A_editorsLineRE |
17473 |
$NF_editorsLineRE" |
$NF_editorsLineRE" |
17475 |
dotest edit-check-20a "$testcvs unedit file1" |
dotest edit-check-20a "$testcvs unedit file1" |
17476 |
dotest edit-check-20b "$testcvs editors" "$O_editorsLineRE" |
dotest edit-check-20b "$testcvs editors" "$O_editorsLineRE" |
17477 |
|
|
17478 |
dotest_fail edit-check-21a "$testcvs edit -c file1" \ |
dotest_fail edit-check-21a "$testcvs -q edit -c file1" \ |
17479 |
"$O_editorsLineRE |
"$SPROG edit: Skipping file \`file1' due to existing editors\." |
|
$SPROG edit: Skipping file \`file1' due to existing editors\." |
|
17480 |
dotest edit-check-21b "$testcvs editors" "$O_editorsLineRE" |
dotest edit-check-21b "$testcvs editors" "$O_editorsLineRE" |
17481 |
|
|
17482 |
dotest edit-check-22a "$testcvs edit -c -f file1" "$O_editorsLineRE" |
dotest edit-check-22a "$testcvs -q edit -c -f file1" |
17483 |
dotest edit-check-22b "$testcvs editors" \ |
dotest edit-check-22b "$testcvs editors" \ |
17484 |
"$A_editorsLineRE |
"$A_editorsLineRE |
17485 |
$NF_editorsLineRE" |
$NF_editorsLineRE" |
17504 |
dotest edit-check-25b "$testcvs editors" "$O_editorsLineRE" |
dotest edit-check-25b "$testcvs editors" "$O_editorsLineRE" |
17505 |
dotest_fail edit-check-25c "test -w file1" |
dotest_fail edit-check-25c "test -w file1" |
17506 |
|
|
17507 |
dotest edit-check-26a "$testcvs edit file1" "$O_editorsLineRE" |
dotest edit-check-26a "$testcvs -q edit file1" |
17508 |
dotest edit-check-26b "$testcvs editors file1" \ |
dotest edit-check-26b "$testcvs editors file1" \ |
17509 |
"$A_editorsLineRE |
"$A_editorsLineRE |
17510 |
$NF_editorsLineRE" |
$NF_editorsLineRE" |
17545 |
# (if the process doing the exec exits before the parent |
# (if the process doing the exec exits before the parent |
17546 |
# gets around to sending data to it) or "broken pipe" (if it |
# gets around to sending data to it) or "broken pipe" (if it |
17547 |
# is the other way around). |
# is the other way around). |
17548 |
dotest_fail edit-check-31ar "$testcvs edit file1" \ |
dotest_fail edit-check-31ar "$testcvs -q edit file1" \ |
17549 |
"$SPROG \[edit aborted\]: cannot exec $TESTDIR/cvs-none: $DOTSTAR" |
"$SPROG \[edit aborted\]: cannot exec $TESTDIR/cvs-none: $DOTSTAR" |
17550 |
dotest edit-check-31br "test -w file1" |
dotest edit-check-31br "test -w file1" |
17551 |
dotest edit-check-31cr "cat CVS/Notify" \ |
dotest edit-check-31cr "cat CVS/Notify" \ |
17588 |
|
|
17589 |
cd .. |
cd .. |
17590 |
|
|
17591 |
dotest edit-check-33a "$testcvs edit -c" |
dotest edit-check-33a "$testcvs -q edit -c" |
17592 |
|
|
17593 |
dotest edit-check-33b "$testcvs editors" \ |
dotest edit-check-33b "$testcvs editors" \ |
17594 |
"$AF_editorsLineRE |
"$AF_editorsLineRE |
17596 |
$F3_editorsLineRE" |
$F3_editorsLineRE" |
17597 |
dotest edit-check-33c "test -w second-dir/file3" |
dotest edit-check-33c "test -w second-dir/file3" |
17598 |
|
|
17599 |
dotest_fail edit-check-34a "$testcvs edit -c file1 file2" \ |
dotest_fail edit-check-34a "$testcvs -q edit -c file1 file2" \ |
17600 |
"$AF_editorsLineRE |
"$SPROG edit: Skipping file \`file1' due to existing editors\. |
|
$SPROG edit: Skipping file \`file1' due to existing editors\. |
|
|
$AF_editorsLineRE |
|
17601 |
$SPROG edit: Skipping file \`file2' due to existing editors\." |
$SPROG edit: Skipping file \`file2' due to existing editors\." |
17602 |
|
|
17603 |
dotest edit-check-34b "$testcvs editors file1 file2" \ |
dotest edit-check-34b "$testcvs editors file1 file2" \ |
17662 |
dotest unedit-without-baserev-7 "${testcvs} -Q co x" '' |
dotest unedit-without-baserev-7 "${testcvs} -Q co x" '' |
17663 |
cd x |
cd x |
17664 |
|
|
17665 |
dotest unedit-without-baserev-10 "${testcvs} edit m" '' |
dotest unedit-without-baserev-10 "$testcvs -q edit m" |
17666 |
echo 'edited in 2' >m |
echo 'edited in 2' >m |
17667 |
cd ../.. |
cd ../.. |
17668 |
|
|
17669 |
cd 1/x |
cd 1/x |
17670 |
|
|
17671 |
editorsLineRE="m $username [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR/2/x" |
editorsLineRE="m $username [SMTWF][uoehra][neduit] [JFAMSOND][aepuco][nbrylgptvc] [0-9 ][0-9] [0-9:]* [0-9][0-9][0-9][0-9] -0000 $hostname $TESTDIR/2/x" |
17672 |
dotest unedit-without-baserev-11 "$testcvs edit m" "$editorsLineRE" |
dotest unedit-without-baserev-11 "$testcvs -q edit m" |
17673 |
|
|
17674 |
echo 'edited in 1' >m |
echo 'edited in 1' >m |
17675 |
dotest unedit-without-baserev-12 "${testcvs} -q ci -m edit-in-1" \ |
dotest unedit-without-baserev-12 "${testcvs} -q ci -m edit-in-1" \ |
28307 |
dotest release-20 '$testcvs -q ci -m add' \ |
dotest release-20 '$testcvs -q ci -m add' \ |
28308 |
"$CVSROOT_DIRNAME/first-dir/second-dir/file1,v <-- file1 |
"$CVSROOT_DIRNAME/first-dir/second-dir/file1,v <-- file1 |
28309 |
initial revision: 1\.1" |
initial revision: 1\.1" |
28310 |
dotest release-21 "$testcvs edit file1" |
dotest release-21 "$testcvs -q edit file1" |
28311 |
cd .. |
cd .. |
28312 |
dotest release-22 "echo yes | $testcvs release -d second-dir" \ |
dotest release-22 "echo yes | $testcvs release -d second-dir" \ |
28313 |
"You have \[0\] altered files in this repository. |
"You have \[0\] altered files in this repository. |
28314 |
Are you sure you want to release (and delete) directory \`second-dir': " |
Are you sure you want to release (and delete) directory \`second-dir': " |
28315 |
dotest release-23 "$testcvs -q update -d" "U second-dir/file1" |
dotest release-23 "$testcvs -q update -d" "U second-dir/file1" |
28316 |
dotest release-24 "$testcvs edit" |
dotest release-24 "$testcvs -q edit" |
28317 |
|
|
28318 |
dokeep |
dokeep |
28319 |
cd ../.. |
cd ../.. |