Lines Matching defs:dotest
425 # See dotest and dotest_fail for explanation (this is the parts
429 if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : "$3${ENDANCHOR}" >/dev/null; then
440 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
444 elif test -z "$3" && test ! -s ${TESTDIR}/dotest.tmp; then
447 if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : "$4${ENDANCHOR}" >/dev/null; then
448 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
453 echo "$3" > ${TESTDIR}/dotest.ex1
456 echo "$4" > ${TESTDIR}/dotest.ex2
458 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
464 echo "$3" > ${TESTDIR}/dotest.exp
466 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
473 if $EXPR "`cat ${TESTDIR}/dotest.tmp`" : \
474 "`cat ${TESTDIR}/dotest.exp`" >/dev/null; then
485 while [ $line -le `wc -l <${TESTDIR}/dotest.tmp` ] ; do
486 if $EXPR "`sed -n ${line}p ${TESTDIR}/dotest.tmp`" : \
487 "`sed -n ${line}p ${TESTDIR}/dotest.exp`" >/dev/null; then
489 elif test -z "`sed -n ${line}p ${TESTDIR}/dotest.tmp`" &&
490 test -z "`sed -n ${line}p ${TESTDIR}/dotest.exp`"; then
495 sed -n ${line}p ${TESTDIR}/dotest.exp >>${LOGFILE}
497 sed -n ${line}p ${TESTDIR}/dotest.tmp >>${LOGFILE}
514 if test -s ${TESTDIR}/dotest.tmp; then
517 echo "$3" > ${TESTDIR}/dotest.exp
518 rm -f ${TESTDIR}/dotest.ex2
520 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
526 echo "$3" > ${TESTDIR}/dotest.exp
531 mv ${TESTDIR}/dotest.exp ${TESTDIR}/dotest.ex1
532 echo "$4" > ${TESTDIR}/dotest.exp
536 mv ${TESTDIR}/dotest.exp ${TESTDIR}/dotest.ex2
542 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
549 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
557 # dotest TESTNAME COMMAND OUTPUT [OUTPUT2]
569 dotest ()
571 rm -f ${TESTDIR}/dotest.ex? 2>&1
572 eval "$2" >${TESTDIR}/dotest.tmp 2>&1
575 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
582 # Like dotest except only 2 args and result must exactly match stdin
585 rm -f ${TESTDIR}/dotest.ex? 2>&1
586 eval "$2" >${TESTDIR}/dotest.tmp 2>&1
589 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
593 cat >${TESTDIR}/dotest.exp
594 if cmp ${TESTDIR}/dotest.exp ${TESTDIR}/dotest.tmp >/dev/null 2>&1; then
598 cat ${TESTDIR}/dotest.exp >>${LOGFILE}
600 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
605 # Like dotest except exitstatus should be nonzero.
608 rm -f ${TESTDIR}/dotest.ex? 2>&1
609 eval "$2" >${TESTDIR}/dotest.tmp 2>&1
612 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
619 # Like dotest except second argument is the required exitstatus.
622 eval "$3" >${TESTDIR}/dotest.tmp 2>&1
625 cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
632 # Like dotest except output is sorted.
635 rm -f ${TESTDIR}/dotest.ex? 2>&1
636 eval "$2" >${TESTDIR}/dotest.tmp1 2>&1
639 cat ${TESTDIR}/dotest.tmp1 >>${LOGFILE}
643 ${TR} ' ' ' ' < ${TESTDIR}/dotest.tmp1 | sort > ${TESTDIR}/dotest.tmp
1571 dotest 1 "${testcvs} init" ''
1572 dotest 1a "${testcvs} init" ''
1588 dotest version-1 "${testcvs} --version" \
1601 dotest version-2r "${testcvs} version" \
1605 dotest version-2 "${testcvs} version" \
1621 dotest basica-0a "${testcvs} -q co -l ." ''
1623 dotest basica-0b "${testcvs} add first-dir" \
1628 dotest basica-1 "${testcvs} -q co first-dir" ''
1633 dotest basica-1a0 "${testcvs} -q update" ''
1634 dotest basica-1a1 "${testcvs} -q diff -c" ''
1635 dotest basica-1a2 "${testcvs} -q status" ''
1640 dotest basica-1a10 "${testcvs} -n add sdir" \
1646 dotest basica-2 "${testcvs} add sdir" \
1650 dotest basica-3 "${testcvs} add ssdir" \
1665 dotest basica-4 "${testcvs} add ssfile" \
1672 dotest basica-5 "${testcvs} -q ci -m add-it" \
1683 dotest basica-5b "${testcvs} -q tag NOT_RESERVED" \
1686 dotest basica-6 "${testcvs} -q update" ''
1714 dotest basica-7 "${testcvs} -q ci -m modify-it" \
1722 dotest basica-8 "${testcvs} -q update" ''
1726 dotest basica-8a0 "${testcvs} -q ci -m not-modified ssfile" ''
1727 dotest basica-8a "${testcvs} -q ci -f -m force-it" \
1732 dotest basica-8a1 "${testcvs} -q ci -m bump-it -r 2.0" \
1739 dotest basica-8a2 "${testcvs} -q ci -m bump-it -f -r 3" \
1751 dotest basica-8a4 "${testcvs} -q ci -m valid -r 3.1.2" \
1757 dotest basica-8a5 "${testcvs} -q up -A" "[UP] ssfile"
1760 dotest basica-8b "${testcvs} -q diff -r1.2 -r1.3" \
1786 dotest basica-10 "${testcvs} annotate" \
1794 dotest basica-r1 "${testcvs} rm -f ssfile" \
1797 dotest basica-r2 "${testcvs} -q ci -m remove" \
1802 dotest basica-r3 "${testcvs} -q up -p -r 3.1 ssfile >ssfile" ""
1803 dotest basica-r4 "${testcvs} add ssfile" \
1806 dotest basica-r5 "${testcvs} -q ci -m resurrect" \
1819 dotest basica-o2 "${testcvs} admin -o 1.2::1.2 ssfile" \
1822 dotest basica-o2a "${testcvs} admin -o 1.1::NOT_RESERVED ssfile" \
1829 dotest basica-o3 "${testcvs} admin -o 1.2::1.3 ssfile" \
1832 dotest basica-o4 "${testcvs} admin -o 3.1:: ssfile" \
1837 dotest basica-o5 "${testcvs} admin -o ::1.1 ssfile" \
1840 dotest basica-o5a "${testcvs} -n admin -o 1.2::3.1 ssfile" \
1845 dotest basica-o6 "${testcvs} admin -o 1.2::3.1 ssfile" \
1850 dotest basica-o6a "${testcvs} admin -o 3.1.2: ssfile" \
1854 dotest basica-o7 "${testcvs} log -N ssfile" "
1877 dotest basica-o8 "${testcvs} -q update -p -r 1.1 ssfile" "ssfile"
1889 dotest basicb-0a "${testcvs} -q co -l ." ''
1891 dotest basicb-0b "${testcvs} add topfile" \
1894 dotest basicb-0c "${testcvs} -q ci -m add-it topfile" \
1904 dotest basicb-0d "${testcvs} -q co -l ." "U topfile"
1911 dotest basicb-0d0 "${testcvs} -q co -l ." ""
1913 dotest basicb-0e "${testcvs} add first-dir" \
1918 dotest basicb-1 "${testcvs} -q co first-dir" ''
1930 : dotest basicb-1b "cat CVS/Repository" \
1933 dotest basicb-1c "cat first-dir/CVS/Repository" \
1942 dotest basicb-2 "${testcvs} add Emptydir sdir2" \
1947 dotest basicb-2a10 "${testcvs} -n add sfile1" \
1950 dotest basicb-2a11 "${testcvs} status sfile1" \
1957 dotest basicb-3 "${testcvs} add sfile1" \
1960 dotest basicb-3a1 "${testcvs} status sfile1" \
1972 dotest basicb-4 "${testcvs} add sfile2" \
1975 dotest basicb-4a "${testcvs} -q ci CVS" \
1979 dotest basicb-5 "${testcvs} -q ci -m add" \
1993 dotest basicb-6 "${testcvs} -q ci -m modify" \
1998 dotest basicb-7 "${testcvs} -q tag release-1" 'T Emptydir/sfile1
2001 dotest basicb-8 "${testcvs} -q ci -m modify-2" \
2009 : dotest basicb-8a0 "${testcvs} diff -r 1.5 -r 1.7 sfile2" 'error msg'
2015 dotest basicb-cod-1 "${testcvs} -q co -d first-dir1 first-dir" \
2031 dotest basicb-9 \
2044 : dotest basicb-9b "cat CVS/Repository" \
2047 dotest basicb-9c "cat newdir/CVS/Repository" \
2050 dotest basicb-9d "cat newdir/first-dir/CVS/Repository" \
2053 dotest basicb-9e "cat newdir/first-dir/Emptydir/CVS/Repository" \
2056 dotest basicb-9f "cat newdir/first-dir/sdir2/CVS/Repository" \
2060 dotest basicb-10 "cat newdir/first-dir/Emptydir/sfile1 newdir/first-dir/sdir2/sfile2" \
2069 dotest basicb-11 "${testcvs} -q co -d sub1/sub2 first-dir" \
2073 dotest basicb-12 "${testcvs} -q update" ''
2075 dotest basicb-13 "${testcvs} add xx" fixme
2084 dotest basicb-14 "${testcvs} -q co -l ." 'U topfile'
2086 dotest basicb-15 "${testcvs} add second-dir" \
2090 dotest basicb-16 "${testcvs} add aa" \
2093 dotest basicb-17 "${testcvs} -q ci -m add" \
2107 dotest basicb-o2 "${testcvs} -q update -d first-dir" \
2149 dotest basicc-2 "${testcvs} -q co -l ." ''
2151 dotest basicc-3 "${testcvs} add first-dir second-dir" \
2163 dotest basicc-4 "echo *" "first-dir second-dir"
2164 dotest basicc-5 "${testcvs} update" \
2172 dotest basicc-6 "${testcvs} release -d" ""
2173 dotest basicc-7 "test -d ../first-dir" ""
2177 dotest basicc-8 "${testcvs} -Q release -d ." \
2179 dotest basicc-9 "test -d ../second-dir" ""
2188 dotest basicc-11 "${testcvs} -Q release -d ./." \
2190 dotest basicc-11a "test -d ../second-dir" ""
2196 dotest basicc-12 "${testcvs} -Q co ." ""
2197 dotest basicc-13 "echo *" "CVS CVSROOT first-dir second-dir"
2198 dotest basicc-14 "${testcvs} -Q release first-dir second-dir" ""
2199 dotest basicc-15 "${testcvs} -Q release -d first-dir second-dir" ""
2200 dotest basicc-16 "echo *" "CVS CVSROOT"
2212 dotest basic1-1 "${testcvs} -q co first-dir" ''
2220 dotest basic1-14-add-add "${testcvs} add file2 file3 file4 file5" \
2226 dotest basic1-15-add-add \
2232 dotest basic1-16-add-add "${testcvs} -q update" \
2237 dotest basic1-17-add-add "${testcvs} -q status" \
2273 dotest basic1-18-add-add "${testcvs} -q log" \
2279 dotest basic1-21-add-add "${testcvs} -q update" \
2285 dotest basic1-22-add-add "${testcvs} log first-dir" \
2291 dotest basic1-23-add-add "${testcvs} status first-dir" \
2328 dotest basic1-24-add-add "${testcvs} update first-dir" \
2334 dotest basic1-27-add-add "${testcvs} co first-dir" \
2341 dotest basic1-14-add-ci \
2367 dotest basic1-15-add-ci \
2369 dotest basic1-16-add-ci "${testcvs} -q update" ''
2370 dotest basic1-17-add-ci "${testcvs} -q status" \
2408 # Note: using dotest fails here. It seems to be related
2410 # dotest basic1-18-add-ci "${testcvs} log" "${DOTSTAR}"
2417 dotest basic1-21-add-ci "${testcvs} -q update" ''
2418 # See test basic1-18-add-ci for explanation of non-use of dotest.
2426 # See test basic1-18-add-ci for explanation of non-use of dotest.
2432 dotest basic1-24-add-ci "${testcvs} -q update first-dir" ''
2433 dotest basic1-27-add-ci "${testcvs} -q co first-dir" ''
2437 dotest basic1-14-rm-rm "${testcvs} rm file2 file3 file4 file5" \
2444 dotest basic1-15-rm-rm \
2450 dotest basic1-16-rm-rm "${testcvs} -q update" \
2455 dotest basic1-17-rm-rm "${testcvs} -q status" \
2499 dotest basic1-21-rm-rm "${testcvs} -q update" \
2514 dotest basic1-24-rm-rm "${testcvs} -q update first-dir" \
2519 dotest basic1-27-rm-rm "${testcvs} -q co first-dir" \
2525 dotest basic1-14-rm-ci "${testcvs} -q commit -m test" \
2542 dotest basic1-15-rm-ci \
2544 dotest basic1-16-rm-ci "${testcvs} -q update" ''
2545 dotest basic1-17-rm-ci "${testcvs} -q status" ''
2554 dotest basic1-21-rm-ci "${testcvs} -q update" ''
2565 dotest basic1-24-rm-ci "${testcvs} -q update first-dir" ''
2566 dotest basic1-27-rm-ci "${testcvs} -q co first-dir" ''
2569 dotest basic1-28 "${testcvs} -q tag first-dive" ''
2585 dotest deep-1 "${testcvs} -q co first-dir" ''
2589 dotest deep-2-$i "${testcvs} add $i" \
2593 dotest deep-3-$i "${testcvs} add file1" \
2651 dotest deep-4a0 "${testcvs} rm file1" \
2654 dotest deep-4a1 "${testcvs} -q ci -m rm-it" "Removing file1;
2659 dotest deep-4a2 "${testcvs} -q update -P dir6/dir7" ''
2671 dotest deep-4b0a "${testcvs} -q diff" ''
2672 dotest deep-4b0b "${testcvs} -q ci" ''
2673 dotest deep-4b1 "${testcvs} -q update" ''
2674 dotest deep-4b2 "${testcvs} -q update -d -P" \
2681 dotest deep-rm1 "${testcvs} rm -f file1" \
2685 dotest deep-rm2 "${testcvs} -q update -d -P" 'R dir7/file1'
2686 dotest deep-rm3 "test -d dir7" ''
2687 dotest deep-rm4 "${testcvs} -q ci -m rm-it" "Removing dir7/file1;
2691 dotest deep-rm5 "${testcvs} -q update -d -P" ''
2696 dotest deep-rm7 "${testcvs} rm -f -R dir5" \
2702 dotest deep-rm8 "${testcvs} -q ci -m rm-it" \
2711 dotest deep-rm9 "${testcvs} -q update -d -P" ''
2739 dotest basic2-1 "${testcvs} -q co first-dir" ''
2743 dotest basic2-2-$i "${testcvs} add $i" \
2753 dotest basic2-3-$i "${testcvs} add file6 file7" \
2760 dotest basic2-4 "${testcvs} update first-dir" \
2772 dotest basic2-5 "${testcvs} log first-dir" \
2783 dotest basic2-6 "${testcvs} status first-dir" \
2848 dotest basic2-8 "${testcvs} -q ci -m 'second dive' first-dir" \
2886 dotest basic2-9 "${testcvs} tag second-dive first-dir" \
2909 dotest basic2-10-$i "${testcvs} rm file7" \
2916 dotest basic2-11-$i "${testcvs} add file14" \
2922 dotest basic2-12 "${testcvs} update first-dir" \
2937 dotest basic2-13 "${testcvs} log first-dir" \
3047 dotest basic2-14 "${testcvs} status first-dir" \
3139 dotest basic2-16 "${testcvs} ci -m 'third dive' first-dir" \
3185 dotest basic2-17 "${testcvs} -q update first-dir" ''
3187 dotest basic2-18 "${testcvs} tag third-dive first-dir" \
3198 dotest basic2-19 "echo yes | ${testcvs} release -d first-dir" \
3208 dotest basic2-21 "${testcvs} rtag rtagged-by-head first-dir" \
3214 dotest basic2-22 "${testcvs} rtag -r rtagged-by-head rtagged-by-tag first-dir" \
3220 dotest basic2-23 "${testcvs} rtag -r1.1 rtagged-by-revision first-dir" \
3226 dotest basic2-24 "${testcvs} rdiff -r1.1 -rrtagged-by-head first-dir" \
3282 dotest basic2-25 "${testcvs} export -r rtagged-by-head first-dir" \
3294 dotest basic2-26 "${testcvs} export -r rtagged-by-tag first-dir" \
3305 dotest basic2-27 "directory_cmp 1dir first-dir"
3309 dotest basic2-28 "${testcvs} export -rrtagged-by-revision -d export-dir first-dir" \
3323 dotest basic2-29 "${testcvs} co -r1.1 first-dir" \
3340 dotest basic2-30 "directory_cmp first-dir export-dir"
3362 dotest basic2-32 "${testcvs} export -r HEAD second-dir" \
3376 dotest basic2-33 "directory_cmp first-dir second-dir"
3386 dotest basic2-34 "${testcvs} update -A -l *file*" \
3392 dotest basic2-35 "${testcvs} tag -l -d rtagged-by-revision" \
3396 dotest basic2-36 "${testcvs} tag -l rtagged-by-revision" \
3406 dotest basic2-37 "${testcvs} -q diff -u" ''
3408 dotest basic2-38 "${testcvs} update" \
3417 # dotest basic2-39 "directory_cmp 1dir first-dir"
3432 dotest basic2-64 "${testcvs} his -x TOFWUCGMAR -a" \
3492 dotest files-1 "${testcvs} -q co -l ." ""
3494 dotest files-2 "${testcvs} add first-dir" \
3498 dotest files-3 "${testcvs} add tfile" \
3501 dotest files-4 "${testcvs} -q ci -m add" \
3508 dotest files-5 "${testcvs} -q tag -b C" "T tfile"
3509 dotest files-6 "${testcvs} -q update -r C" ""
3511 dotest files-7 "${testcvs} add dir" \
3516 dotest files-6 "${testcvs} add .file" \
3520 dotest files-7 "${testcvs} add sdir" \
3525 dotest files-8 "${testcvs} add ssdir" \
3530 dotest files-9 "${testcvs} add .file" \
3534 dotest files-10 "${testcvs} -q ci -m test" \
3547 dotest files-11 \
3571 dotest files-12-workaround \
3582 dotest files-12 \
3593 dotest files-13 \
3604 dotest files-14 \
3635 dotest spacefiles-1 "${testcvs} -q co -l ." ""
3637 dotest spacefiles-2 "${testcvs} add -- ${dashc} top" \
3641 dotest spacefiles-3 "${testcvs} -q ci -m add" \
3655 dotest spacefiles-4 "${testcvs} add 'first dir'" \
3658 dotest spacefiles-5 "${testcvs} add -- ${dashb}" \
3662 dotest spacefiles-6 "${testcvs} add 'a file'" \
3665 dotest spacefiles-7 "${testcvs} -q ci -m add" \
3672 dotest spacefiles-8 "${testcvs} -q tag new-tag" "T a file"
3680 dotest spacefiles-9 "${testcvs} -q co -- /top" "U \./top"
3681 dotest spacefiles-10 "${testcvs} co -- ${dashb}" \
3683 dotest spacefiles-11 "${testcvs} -q co -- ${dashc}" "U \./${dashc}"
3685 dotest spacefiles-12 "${testcvs} -q co -- /${dashc}" "U \./${dashc}"
3686 dotest spacefiles-13 "${testcvs} -q co 'first dir'" \
3691 dotest spacefiles-14 "${testcvs} -q co 'first dir/a file'" \
3706 dotest commit-readonly-1 "$testcvs -Q import -m . $module X Y" ''
3707 dotest commit-readonly-2 "$testcvs -Q co $module" ''
3715 dotest commit-readonly-3 "$testcvs add $file" \
3718 dotest commit-readonly-4 "$testcvs -Q ci -m . $file" \
3730 dotest commit-readonly-5 "$testcvs -Q ci -m . $file" \
3760 dotest rdiff-2 \
3767 dotest rdiff-3 \
3775 dotest rdiff-4 \
3779 dotest rdiff-5 \
3787 dotest rdiff-6 \
3793 dotest rdiff-7 \
3812 dotest rdiff-8 \
3855 dotest diff-1 "${testcvs} -q co -l ." ''
3857 dotest diff-2 "${testcvs} add first-dir" \
3867 dotest diff-4 "${testcvs} add abc" \
3870 dotest diff-5 "${testcvs} -q ci -mtest" \
3878 dotest diff-6 "${testcvs} -q ci -mtest" \
3927 dotest 65a0 "${testcvs} add subdir" \
3931 dotest 65a1 "${testcvs} add sfile" \
3934 dotest 65a2 "${testcvs} -q ci -m add-it" \
3942 dotest 65a3 "${testcvs} rm sfile" \
3945 dotest 65a4 "${testcvs} -q ci -m remove-it" \
3951 dotest 65a5 "${testcvs} -q update -P" ''
3991 dotest 69a2 "cat file1" ''
4017 dotest death-file4-add "${testcvs} add file4" \
4020 dotest death-file4-ciadd "${testcvs} -q ci -m add file4" \
4028 dotest death-file4-rm "${testcvs} remove file4" \
4031 dotest death-file4-cirm "${testcvs} -q ci -m remove file4" \
4038 dotest death-72a "${testcvs} -q tag bp_branch1" 'T file1
4072 dotest death-76a0 \
4082 dotest death-76a1 \
4164 dotest 86 "${testcvs} -q update -j branch1" \
4195 dotest 89 "${testcvs} -q ci -m test" \
4211 dotest 89a "${testcvs} -q co first-dir" 'U first-dir/file1
4269 dotest 95 "${testcvs} -q update -j HEAD" \
4288 dotest death2-1 "${testcvs} -q co first-dir" ''
4295 dotest death2-2 "${testcvs} add file1 file4" \
4300 dotest death2-3 "${testcvs} -q commit -m add" \
4315 dotest death2-4 "${testcvs} -q tag -b branch" \
4318 dotest death2-5 "${testcvs} -q tag tag" \
4323 dotest death2-6 "${testcvs} -q update -r branch" ''
4327 dotest death2-7 "${testcvs} rm file1" \
4350 dotest death2-8 "${testcvs} -q ci -m removed" \
4390 dotest death2-rdiff-1 \
4393 dotest death2-rdiff-2 "${testcvs} -q rdiff -rtag -rbranch first-dir" \
4405 dotest death2-9 "${testcvs} add file1" \
4425 dotest death2-10 "${testcvs} -q commit -m add" \
4432 dotest death2-10a "${testcvs} rm -f file4" \
4435 dotest death2-10b "${testcvs} -q ci -m removed" \
4442 dotest death2-11 "${testcvs} -q update -A" \
4448 dotest death2-12 "${testcvs} add file2" \
4451 dotest death2-13 "${testcvs} -q commit -m add" \
4461 dotest death2-13a "${testcvs} -q commit -m mod" \
4471 dotest death2-14 "${testcvs} -q update -r branch" \
4478 dotest death2-15 "${testcvs} add file2" \
4481 dotest death2-16 "${testcvs} -q commit -m add" \
4489 dotest death2-17 "${testcvs} add file3" \
4492 dotest death2-18 "${testcvs} -q commit -m add" \
4580 dotest death2-19 "${testcvs} -q update -r tag" \
4605 dotest death2-21 "${testcvs} -q update -A" \
4610 dotest death2-22 "${testcvs} -q co first-dir" \
4616 dotest death2-23 "${testcvs} rm -f file4" \
4619 dotest death2-24 "${testcvs} -q ci -m removed file4" \
4639 dotest rm-update-message-setup-1 "$testcvs -q co rm-update-message" ''
4643 dotest rm-update-message-setup-2 "$testcvs -q add $file" \
4645 dotest rm-update-message-setup-3 "$testcvs -q ci -mcreate $file" \
4655 dotest rm-update-message-1 "$testcvs up $file" "U $file"
4657 dotest rm-update-message-1 "$testcvs up $file" \
4679 dotest rmadd-1 "${testcvs} -q co -l ." ''
4681 dotest rmadd-2 "${testcvs} add first-dir" \
4685 dotest rmadd-3 "${testcvs} add file1" \
4701 dotest rmadd-7 "${testcvs} -q ci -r 7.... -m add" \
4715 dotest rmadd-7a "cat CVS/Tag" "T7"
4718 dotest rmadd-8 "${testcvs} -q tag -b mybranch" "T file1"
4719 dotest rmadd-9 "${testcvs} -q tag mynonbranch" "T file1"
4727 dotest rmadd-10 "${testcvs} add file2" \
4731 dotest rmadd-11 "${testcvs} -q ci -m add" \
4739 dotest rmadd-12 "${testcvs} -q update -A" ""
4741 dotest rmadd-13 "${testcvs} add file3" \
4749 dotest rmadd-15 "${testcvs} -q ci -r mybranch -m add file3" \
4758 dotest rmadd-16 "${testcvs} add file4" \
4769 dotest rmadd-18 "${testcvs} -q update -p -r mynonbranch file1" \
4777 dotest rmadd-20 "${testcvs} -q update -r mynonbranch file1" ""
4780 dotest rmadd-21 \
4792 dotest rmadd-22 "${testcvs} add file5" \
4799 dotest rmadd-23r "${testcvs} -q ci -m add" \
4806 dotest rmadd-23-workaroundr \
4813 dotest rmadd-23 "${testcvs} -q ci -m add" \
4828 dotest rmadd-24a "${testcvs} -q ci -r 8.4 -m change file5" \
4835 dotest rmadd-25 "${testcvs} status file5" \
4854 dotest rmadd2-1 "${testcvs} -q co -l ." ''
4856 dotest rmadd2-2 "${testcvs} add first-dir" \
4860 dotest rmadd2-3 "${testcvs} add file1" \
4863 dotest rmadd2-4 "${testcvs} -q ci -m add" \
4870 dotest rmadd2-4a "${testcvs} -Q tag tagone" ""
4871 dotest rmadd2-5 "${testcvs} rm -f file1" \
4874 dotest rmadd2-6 "${testcvs} -q ci -m remove" \
4879 dotest rmadd2-7 "${testcvs} -q update -j 1.2 -j 1.1 file1" "U file1"
4880 dotest rmadd2-8 "${testcvs} -q ci -m readd" \
4886 dotest rmadd2-9 "${testcvs} -q ci -m modify" \
4891 dotest rmadd2-10 "${testcvs} -q update -j 1.4 -j 1.3 file1" \
4896 dotest rmadd2-11 "${testcvs} -q ci -m undo" \
4901 dotest rmadd2-12 "cat file1" "initial contents"
4902 dotest rmadd2-13 "${testcvs} -q update -p -r 1.3" "initial contents"
4906 dotest rmadd2-14 "${testcvs} -q update -j 1.3 -j 1.2 file1" \
4910 dotest rmadd2-14a "${testcvs} -q update -p" "initial contents"
4911 dotest rmadd2-14b "${testcvs} -q update -p -r 1.5" "initial contents"
4912 dotest rmadd2-14c "${testcvs} -q update -p -r 1.3" "initial contents"
4914 dotest rmadd2-15 "${testcvs} -q ci -m re-remove" \
4919 dotest rmadd2-16 "${testcvs} log -h file1" "
4931 dotest rmadd2-17 "${testcvs} status -v file1" \
4972 dotest dirs-2 "${testcvs} -Q co dir1" ""
4982 dotest dirs-3 "${testcvs} update" \
4987 dotest dirs-3a "${testcvs} update -d" \
4997 echo no | dotest dirs-4 "${testcvs} release -d dir1/sdir" \
5006 dotest dirs-5 "cat dir1/CVS/Entries" \
5009 dotest dirs-6 "${testcvs} update" "${PROG} [a-z]*: Updating dir1"
5010 dotest dirs-7 "cat dir1/CVS/Entries" \
5013 dotest dirs-8 "${testcvs} update -d dir1" \
5028 dotest dirs2-1 "${testcvs} -q co -l ." ''
5030 dotest dirs2-2 "${testcvs} add first-dir" \
5034 dotest dirs2-3 "${testcvs} add sdir" \
5037 dotest dirs2-4 "${testcvs} add sdir/file1" \
5040 dotest dirs2-5 "${testcvs} -q ci -m add" \
5060 dotest dirs2-7 "${testcvs} update -d" \
5066 dotest dirs2-6 "${testcvs} update -d" \
5070 dotest dirs2-7 "${testcvs} update -d" \
5078 dotest dirs2-8 "${testcvs} -q co first-dir" 'U first-dir/sdir/file1'
5080 dotest dirs2-9 "${testcvs} -q tag -b br" "T sdir/file1"
5089 dotest dirs2-10-rem \
5111 dotest dirs2-11 "${testcvs} -q co -r br first-dir" \
5116 dotest dirs2-12 "${testcvs} rm -f sdir/file1" \
5119 dotest dirs2-13 "${testcvs} -q ci -m remove" \
5126 dotest dirs2-14 "${testcvs} update -d -r br" \
5131 dotest dirs2-14 "${testcvs} update -d -r br" \
5144 dotest branches-1 "${testcvs} -q co first-dir" ''
5150 dotest branches-2 "${testcvs} add file1 file2 file3 file4" \
5156 dotest branches-2a "${testcvs} -n -q ci -m dont-commit" ""
5184 dotest branches-3.2 "${testcvs} -q ci -m trunk-before-branch" \
5191 dotest branches-3.3 "${testcvs} -qn tag dont-tag" \
5200 dotest branches-4 "${testcvs} tag -b br1" "${PROG}"' [a-z]*: Tagging \.
5205 dotest branches-5 "${testcvs} update -r br1" \
5210 dotest branches-6 "${testcvs} -q ci -m modify" \
5223 dotest branches-7 "${testcvs} -q tag -b brbr" 'T file1
5227 dotest branches-8 "${testcvs} -q update -r brbr" ''
5230 dotest branches-9 "${testcvs} -q ci -m modify" \
5239 dotest branches-10 "cat file1 file2 file3 file4" '1:brbr
5243 dotest branches-11 "${testcvs} -q update -r br1" \
5246 dotest branches-12 "cat file1 file2 file3 file4" '1:br1
5251 dotest branches-12.2 "${testcvs} -q ci -m change-on-br1" \
5256 dotest branches-13 "${testcvs} -q update -A" '[UP] file1
5259 dotest branches-14 "cat file1 file2 file3 file4" '1:ancest
5264 dotest branches-14.2 \
5270 dotest branches-14.3 "${testcvs} log file4" \
5341 dotest branches-15 \
5348 dotest branches-16 "cat file1" '<<<<<<< file1
5354 dotest branches-o1 "${testcvs} -q admin -o ::brbr" \
5385 dotest branches2-1 "${testcvs} -q co first-dir"
5388 dotest branches2-2 "${testcvs} add file1" \
5391 dotest branches2-3 "${testcvs} commit -m add file1" \
5400 dotest branches2-4 "${testcvs} -q tag tag1" 'T file1'
5403 dotest branches2-5 "${testcvs} -q rtag -b -r tag1 b1 first-dir" ''
5404 dotest branches2-6 "${testcvs} -q rtag -b -r tag1 b2 first-dir" ''
5409 dotest branches2-7 "${testcvs} -q co -r b1 first-dir" \
5413 dotest branches2-8 "${testcvs} add file2" \
5417 dotest branches2-9 "${testcvs} add dir1" \
5421 dotest branches2-10 "${testcvs} add dir1/file3" \
5424 dotest branches2-11 "${testcvs} -q ci -madd ." \
5443 dotest branches2-12 "${testcvs} -q co -r b2 first-dir" \
5446 dotest branches2-13 "${testcvs} update -d -r b1 dir1" \
5449 dotest branches2-14 "${testcvs} -q status" \
5473 dotest branches2-15 "${testcvs} update -d -j b1 dir1" \
5480 dotest branches2-16 "${testcvs} -q status" \
5500 dotest branches2-17 "${testcvs} update -d -P dir1" \
5503 dotest branches2-19 "${testcvs} update -d -P -r b1 dir1" \
5506 dotest branches2-20 "${testcvs} -q status" \
5526 dotest branches2-21 "${testcvs} update -d -P -j b1 dir1" \
5529 dotest branches2-22 "${testcvs} -q status" \
5557 dotest branches2-23 "${testcvs} -q co -r b1 first-dir" \
5562 dotest branches2-24 "${testcvs} -q co -r b1 first-dir" \
5568 dotest branches2-25 "${testcvs} add dir2" \
5572 dotest branches2-26 "${testcvs} add dir2/file4" \
5575 dotest branches2-27 "${testcvs} -q commit -madd" \
5584 dotest branches2-28 "${testcvs} update -d dir2" \
5588 dotest branches2-29 "${testcvs} -q status" \
5597 dotest branches2-30 "cat CVS/Tag" 'Tb1'
5602 dotest branches2-31 "${testcvs} update -A -d dir2" \
5605 dotest branches2-32 "${testcvs} -q status" ''
5610 dotest branches2-34 "${testcvs} add file5" \
5613 dotest branches2-35 "${testcvs} -q commit -madd" \
5622 dotest branches2-36 "${testcvs} -q update -d dir2" 'U dir2/file5'
5624 dotest branches2-37 "${testcvs} -q status" \
5643 dotest tagc-1 "${testcvs} -q co -l ." ''
5645 dotest tagc-2 "${testcvs} add first-dir" \
5649 dotest tagc-3 "${testcvs} add file1" \
5652 dotest tagc-4 "${testcvs} -q ci -m add" \
5659 dotest tagc-5 "${testcvs} -q tag -c tag1" "T file1"
5661 dotest tagc-6 "${testcvs} -q tag -c tag2" "T file1"
5672 dotest tagc-8 "${testcvs} -q co first-dir" "U first-dir/file1"
5674 dotest tagc-9 "${testcvs} -q ci -m modify" \
5680 dotest tagc-10 "${testcvs} -q tag -c tag4" "T file1"
5693 dotest tagf-1 "${testcvs} -q co -l ." ''
5695 dotest tagf-2 "${testcvs} add first-dir" \
5699 dotest tagf-3 "${testcvs} add file1 file2" \
5703 dotest tagf-4 "${testcvs} -q ci -m add" \
5718 dotest tagf-5 "${testcvs} -q tag -b br" "T file1
5720 dotest tagf-6 "${testcvs} -q update -r br" ""
5723 dotest tagf-7 "${testcvs} -q ci -m modify" \
5736 dotest tagf-8 "${testcvs} -q tag -F br" "T file1
5740 dotest tagf-9 "${testcvs} -q status -v file1" \
5754 dotest tagf-10 "${testcvs} -q tag -d br" "D file1
5759 dotest tagf-11 "${testcvs} -q tag -r 1.1 -b br file1" "T file1"
5761 dotest tagf-12 "${testcvs} -q admin -nbr:1.1.2 file2" \
5767 dotest tagf-13 "${testcvs} -q update -r br" \
5779 dotest tagf-14 "cat file1" \
5786 dotest tagf-15 "${testcvs} -q ci -m recovered" \
5809 dotest rcsdiff-1 "${testcvs} -q co first-dir" ''
5812 dotest rcsdiff-2 "${testcvs} add -m new-file foo.c" \
5815 dotest rcsdiff-3 "${testcvs} commit -m rev1 foo.c" \
5822 dotest rcsdiff-4 "${testcvs} tag first foo.c" "T foo\.c"
5823 dotest rcsdiff-5 "${testcvs} update -p -r first foo.c" \
5832 dotest rcsdiff-6 "${testcvs} commit -m rev2 foo.c" \
5837 dotest rcsdiff-7 "${testcvs} tag second foo.c" "T foo\.c"
5838 dotest rcsdiff-8 "${testcvs} update -p -r second foo.c" \
5888 dotest rcslib-diffrgx-1 "${testcvs} -q add -m '' rgx.c" \
5890 dotest rcslib-diffrgx-2 "${testcvs} -q ci -m '' rgx.c" \
5940 dotest rcslib-merge-1 "${testcvs} -q co -l ." ""
5942 dotest rcslib-merge-2 "${testcvs} -q add first-dir" \
5946 dotest rcslib-merge-3 "${testcvs} -q co first-dir" ""
5952 dotest rcslib-merge-4 "${testcvs} -q add file1" \
5954 dotest rcslib-merge-5 "${testcvs} -q commit -m '' file1" \
5962 dotest rcslib-merge-6 "${testcvs} -q commit -m '' file1" \
5967 dotest rcslib-merge-7 "${testcvs} -q tag -b -r 1.1 patch1" "T file1"
5968 dotest rcslib-merge-8 "${testcvs} -q update -r patch1" "[UP] file1"
5969 dotest rcslib-merge-9 "${testcvs} -q status" \
5978 dotest rcslib-merge-10 "cat file1" \
5983 dotest rcslib-merge-11 "${testcvs} -q commit -m '' file1" \
5988 dotest rcslib-merge-12 "${testcvs} -q update -kv -j1.2" \
5995 dotest rcslib-merge-13 "cat file1" \
6007 dotest rcslib-symlink-1 "ln -s file1,v ${CVSROOT_DIRNAME}/first-dir/file2,v"
6008 dotest rcslib-symlink-2 "${testcvs} update file2" "U file2"
6010 dotest rcslib-symlink-3 "${testcvs} ci -m because file2" \
6015 dotest rcslib-symlink-4 "ls -l $CVSROOT_DIRNAME/first-dir/file2,v" \
6024 dotest rcslib-symlink-5 "${testcvs} tag the_tag" \
6028 dotest rcslib-symlink-6 "ls -l $CVSROOT_DIRNAME/first-dir/file2,v" \
6034 dotest rcslib-symlink-7 "${testcvs} -q co first-dir" \
6038 dotest rcslib-symlink-8 "${testcvs} rm -f file2" \
6041 dotest rcslib-symlink-9 "${testcvs} -q ci -m rm-it" \
6049 dotest rcslib-symlink-10 \
6071 dotest multibranch-1 "${testcvs} -q co first-dir" ''
6074 dotest multibranch-2 "${testcvs} add file1" \
6085 dotest multibranch-4 "${testcvs} tag -b br1" \
6088 dotest multibranch-5 "${testcvs} tag -b br2" \
6091 dotest multibranch-6 "${testcvs} -q update -r br1" ''
6093 dotest multibranch-7 "${testcvs} -q ci -m modify-on-br1" \
6098 dotest multibranch-8 "${testcvs} -q update -r br2" '[UP] file1'
6100 dotest multibranch-9 "${testcvs} -q ci -m modify-on-br2" \
6105 dotest multibranch-10 "${testcvs} -q update -r br1" '[UP] file1'
6106 dotest multibranch-11 "cat file1" 'on-br1'
6107 dotest multibranch-12 "${testcvs} -q update -r br2" '[UP] file1'
6108 dotest multibranch-13 "cat file1" '1:trunk-1
6111 dotest multibranch-14 "${testcvs} log file1" \
6191 dotest import-96.5 "cmp ../imported-f2-orig.tmp imported-f2" ''
6196 dotest import-97 "${testcvs} -q co first-dir" \
6205 dotest import-98-$i "test -f imported-f$i" ''
6211 dotest import-99 "${testcvs} rm imported-f1" \
6219 dotest import-100 "${testcvs} ci -m local-changes" \
6231 dotest import-101 "${testcvs} log imported-f1" \
6261 dotest import-102 "${testcvs} update -rvendor-branch" \
6268 dotest import-103 "${testcvs} rm imported-f4" \
6273 dotest import-104 \
6281 dotest import-105 "${testcvs} -q update -A" \
6306 dotest import-106.5 "cmp ../imported-f2-orig.tmp imported-f2" \
6314 dotest import-107 "${testcvs} co first-dir" \
6324 dotest import-109-$i "test -f imported-f$i" ''
6328 dotest import-110 "${testcvs} -q update -rvendor-branch" \
6332 dotest import-111 "test -f imported-f4" ''
6335 dotest import-112 "${testcvs} -q update -A" \
6341 dotest import-113 \
6355 dotest import-115-$i "test -f imported-f$i" ''
6358 dotest import-116 'cat imported-f2' \
6435 dotest importb-4 "${testcvs} -q co first-dir" \
6439 dotest importb-5 "${testcvs} -q log file1" "
6512 dotest importc-2 "${testcvs} -q co first-dir" \
6519 dotest importc-3 "${testcvs} update adir/sub1" \
6522 dotest importc-4 "${testcvs} update adir/sub1 bdir/subdir" \
6528 dotest importc-5 \
6530 dotest importc-6 "${testcvs} -q update -r wip_test" "M cdir/cfile"
6534 dotest importc-7r "${testcvs} -q ci -m modify -r wip_test" \
6547 dotest importc-7a "${testcvs} -q ci -m modify" \
6556 dotest importc-8 "${testcvs} -q log cdir/cfile" "
6586 dotest importc-9 "${testcvs} -q log bdir/subdir/file1" "
6641 dotest import-after-initial-1 \
6646 dotest import-after-initial-2 "$testcvs -Q co $module" ''
6649 dotest import-after-initial-3 "${testcvs} -Q add $file" ""
6650 dotest import-after-initial-4 "${testcvs} -Q ci -m. $file" \
6667 dotest import-after-initial-5 \
6674 dotest import-after-initial-6 \
6756 dotest join-1 "${testcvs} -q co first-dir" ''
6765 dotest join-2 "${testcvs} add file3 file4 file6 file8" \
6772 dotest join-3 "${testcvs} -q commit -m add" \
6799 dotest join-4 "${testcvs} -q tag -b branch ." \
6810 dotest join-5 "${testcvs} add file2 file7" \
6814 dotest join-6 "${testcvs} rm file6 file8" \
6818 dotest join-7 "${testcvs} -q ci -mx ." \
6848 dotest join-8 "${testcvs} -q co -r branch first-dir" \
6862 dotest join-9 "${testcvs} add file5" \
6865 dotest join-10 "${testcvs} -q ci -mx ." \
6886 dotest join-11 "${testcvs} -q tag T1 ." \
6897 dotest join-12 "${testcvs} add file1 file2" \
6901 dotest join-13 "${testcvs} rm file3 file4 file5 file6" \
6907 dotest join-14 "${testcvs} -q ci -mx ." \
6936 dotest join-15 "${testcvs} -q tag T2 ." \
6945 dotest join-16 "${testcvs} -q co -jT1 -jT2 first-dir" \
6957 dotest join-17 "${testcvs} -q update" \
6965 dotest join-18 "${testcvs} -q update -jT1 -jT2 ." \
6973 dotest join-19 "${testcvs} -q update" \
6991 dotest join-20 "${testcvs} -q co -jbranch first-dir" \
7007 dotest join-21 "${testcvs} -q update" \
7015 dotest join-22 "${testcvs} -q co first-dir" \
7026 dotest join-23 "${testcvs} -q update -jbranch ." \
7038 dotest join-24 "${testcvs} -q update" \
7049 dotest join-25 "${testcvs} -q co first-dir" \
7055 dotest join-26 "${testcvs} -q tag -b br2" \
7060 dotest join-27 "${testcvs} -q update -r br2" ""
7064 dotest join-28 "${testcvs} -q update -j branch" \
7074 dotest join-29 "${testcvs} -q update" \
7088 dotest join-twobranch-1 "${testcvs} -q co -rbranch first-dir" \
7093 dotest join-twobranch-2 "${testcvs} -q update -rbr2 -jbranch" \
7109 dotest join-twobranch-3 "${testcvs} -q update" \
7119 dotest join-30 "${testcvs} -q co first-dir" \
7127 dotest join-31 "${testcvs} -q tag T3 ." \
7135 dotest join-32 "${testcvs} -q ci -mx ." \
7142 dotest join-33 "${testcvs} -q tag T4 ." \
7150 dotest join-34 "${testcvs} -q up -jT3" \
7155 dotest join-35 "${testcvs} -q update" \
7161 dotest join-36 "${testcvs} -q up -j T3 -j T4" \
7169 dotest join-37 "${testcvs} -q update" \
7184 dotest join2-1 "${testcvs} -q co -l ." ''
7186 dotest join2-2 "${testcvs} add first-dir" \
7190 dotest join2-3 "${testcvs} add file1" \
7193 dotest join2-4 "${testcvs} -q ci -m add" \
7200 dotest join2-5 "${testcvs} -q tag -b br1" "T file1"
7201 dotest join2-6 "${testcvs} -q update -r br1" ""
7204 dotest join2-6a "${testcvs} add bradd" \
7207 dotest join2-7 "${testcvs} -q ci -m modify" \
7221 dotest join2-8 "${testcvs} -q update -A file1" '[UP] file1'
7222 dotest join2-9 "${testcvs} -q status file1" \
7231 dotest join2-10 "cat CVS/Tag" "Tbr1"
7233 dotest join2-11 "${testcvs} -q update -j br1 file1" \
7238 dotest join2-12 "cat file1" "initial contents of file1
7241 dotest join2-13 "${testcvs} -q status file1" \
7250 dotest join2-14 "cat CVS/Tag" "Tbr1"
7252 dotest join2-15 "${testcvs} -q ci -m modify file1" \
7261 dotest join2-16 "${testcvs} -q update -r br1" "[UP] file1"
7270 dotest join2-17-circumvent "${testcvs} -q update -A" \
7273 : dotest join2-17 "${testcvs} -q update -A bradd" \
7275 dotest join2-18 "${testcvs} -q update -j br1 bradd" "U bradd"
7276 dotest join2-19 "${testcvs} -q status bradd" \
7285 dotest join2-20 "${testcvs} -q ci -m modify bradd" \
7301 dotest join3-1 "${testcvs} -q co -l ." ''
7303 dotest join3-2 "${testcvs} add first-dir" \
7307 dotest join3-3 "${testcvs} add file1" \
7310 dotest join3-4 "${testcvs} -q ci -m add" \
7317 dotest join3-5 "${testcvs} -q tag -b br1" "T file1"
7318 dotest join3-6 "${testcvs} -q update -r br1" ""
7320 dotest join3-7 "${testcvs} -q ci -m modify" \
7329 dotest join3-8 "${testcvs} -q update -A" "[UP] file1"
7331 dotest join3-8a "${testcvs} add file2" \
7335 dotest join3-9 "${testcvs} -q ci -m modify" \
7346 dotest join3-10 "${testcvs} -q tag -b br2" "T file1
7350 dotest join3-11 "${testcvs} -q update -r br1" "[UP] file1
7352 dotest join3-12 "${testcvs} -q update -j br2" \
7359 dotest join3-13 "cat file1" \
7369 dotest join3-14 "${testcvs} -q update -r br2 file1" \
7373 dotest join3-15 "${testcvs} -q ci -m modify file1" \
7380 dotest join3-16 "${testcvs} -q update -r br1 file1" "[UP] file1"
7385 dotest join3-17 "${testcvs} -q update -j br2 file1" \
7391 dotest join3-18 "cat file1" \
7407 # intermediate dotest's to try and diagnose a different failure
7417 dotest join-readonly-conflict-1 "$testcvs -q co -l ." ''
7425 dotest join-readonly-conflict-2 "$testcvs -Q add $file" ''
7427 dotest join-readonly-conflict-3 "$testcvs -q ci -m . $file" \
7435 dotest join-readonly-conflict-4 "$testcvs tag -b B $file" "T $file"
7436 dotest join-readonly-conflict-5 "$testcvs -q update -rB $file" ''
7438 dotest join-readonly-conflict-6 "$testcvs -q ci -m . $file" \
7445 dotest join-readonly-conflict-7 "$testcvs -Q update -A $file" ''
7450 dotest join-readonly-conflict-8 "$testcvs update -r B $file" \
7461 dotest join-readonly-conflict-9 "$testcvs -Q update -A $file" ''
7473 dotest join-readonly-conflict-11 "$testcvs update -r B $file" \
7491 dotest join-admin-1 "$testcvs -q co -l ." ''
7517 dotest join-admin-1 "$testcvs status b" \
7538 dotest join-admin-2-1 "$testcvs -q co -l ." ''
7541 dotest join-admin-2-2 "$testcvs -q add $module" \
7548 dotest join-admin-2-3 "$testcvs -Q add e" ''
7549 dotest join-admin-2-4 "$testcvs -Q ci -m. e" \
7557 dotest join-admin-2-5 "$testcvs -Q tag -b T" '' "${QUESTION} e0"
7558 dotest join-admin-2-6 "$testcvs -Q update -r T" '' "${QUESTION} e0"
7560 dotest join-admin-2-7 "$testcvs -Q ci -m. e" \
7566 dotest join-admin-2-8 "$testcvs -Q update -A" '' "${QUESTION} e0"
7567 dotest join-admin-2-9 "$testcvs -Q tag -b M1" '' "${QUESTION} e0"
7570 dotest join-admin-2-10 "$testcvs -Q add b" ''
7572 dotest join-admin-2-11 "$testcvs -Q ci -m. b e" \
7584 dotest join-admin-2-12 "$testcvs -Q tag -b M2" '' "${QUESTION} e0"
7586 dotest join-admin-2-13 "$testcvs -Q update -r T" '' "${QUESTION} e0"
7587 dotest join-admin-2-14 "$testcvs update -kk -jM1 -jM2" \
7606 dotest join-admin-2-15 "cat e" '$''Id$'
7677 dotest newb-123a "${testcvs} -q co first-dir" ''
7680 dotest newb-123b "${testcvs} add a" \
7683 dotest newb-123c "${testcvs} -q ci -m added" \
7692 dotest newb-123d "${testcvs} -q tag -b branch" "T a"
7699 dotest newb-123e "${testcvs} -q co -r branch first-dir" \
7706 dotest newb-123f "${testcvs} -q co -r branch first-dir" \
7710 dotest newb-123g "${testcvs} rm a" \
7713 dotest newb-123h "${testcvs} -q ci -m removed" \
7724 dotest newb-123i "${testcvs} -q co -r branch first-dir/a" \
7731 dotest newb-123j0 "${testcvs} status a" \
7741 dotest newb-123j "${testcvs} -q update" \
7761 dotest conflicts-124 "${testcvs} -q co first-dir" ''
7766 dotest conflicts-125 "${testcvs} add a" \
7769 dotest conflicts-126 "${testcvs} -q ci -m added" \
7781 dotest conflicts-126.5 "${testcvs} co -p first-dir" \
7803 dotest conflicts-127b "${testcvs} add dir1" \
7805 dotest conflicts-128 "${testcvs} -q ci -m changed" \
7816 dotest conflicts-128.5 "${testcvs} co -p -l first-dir" \
7836 dotest conflicts-status-0 "${testcvs} status a" \
7845 dotest conflicts-129a "${testcvs} -nq update a" \
7853 dotest conflicts-130 "${testcvs} -q update" \
7874 dotest conflicts-status-1 "${testcvs} status a" \
7891 dotest conflicts-status-2 "${testcvs} -nq ci -m try a" \
7895 dotest conflicts-status-3 "${testcvs} -nq ci -m try a" \
7899 dotest conflicts-status-4 "${testcvs} -qn ci -m try a" \
7904 dotest conflicts-status-5 "${testcvs} status a" \
7913 dotest conflicts-132 "${testcvs} -q ci -m try" \
7923 dotest conflicts-status-6 "${testcvs} status a" \
7932 dotest conflicts-133 "${testcvs} -q ci -m resolved" \
7937 dotest conflicts-status-7 "${testcvs} status a" \
7963 dotest conflicts-136 "${testcvs} -q update first-dir" \
7970 dotest conflicts-137 'test -f first-dir/abc' ''
8027 dotest conflicts2-142a1 "${testcvs} -q co first-dir" ''
8032 dotest conflicts2-142a2 "${testcvs} add a abc" \
8036 dotest conflicts2-142a3 "${testcvs} -q ci -m added" \
8054 dotest conflicts2-142a4 "${testcvs} -q co first-dir" 'U first-dir/a
8066 dotest conflicts2-142b2 "${testcvs} -q ci -m modify-a" \
8073 dotest conflicts2-142b3 "${testcvs} rm a" \
8081 dotest conflicts2-142b5 "${testcvs} add a" "U a
8083 dotest conflicts2-142b6 "${testcvs} -q update" ''
8087 dotest conflicts2-142b7 "${testcvs} rm -f first-dir/a" \
8107 dotest conflicts2-142b8 "${testcvs} add first-dir/a" \
8112 dotest conflicts2-142b9 "${testcvs} rm -f a" \
8118 dotest conflicts2-142b10 "${testcvs} add a" "U a
8121 dotest conflicts2-142b11 "${testcvs} -q update" ''
8130 dotest conflicts2-142c0 "${testcvs} rm abc" \
8133 dotest conflicts2-142c1 "${testcvs} -q ci -m remove-abc" \
8140 dotest conflicts2-142c2 "${testcvs} rm abc" \
8143 dotest conflicts2-142c3 "${testcvs} update" \
8152 dotest conflicts2-142d0 "${testcvs} add aa.c same.c" \
8156 dotest conflicts2-142d1 "${testcvs} -q ci -m added" \
8193 dotest conflicts2-142d3 "${testcvs} -q status aa.c" \
8212 #dotest conflicts2-142d5 "${testcvs} -q diff -r HEAD -N aa.c" fixme
8219 #dotest conflicts2-142d6 "${testcvs} -q rm -f aa.c" fixme
8220 dotest conflicts2-142d6 "rm aa.c" ''
8221 dotest conflicts2-142d7 "${testcvs} -q update aa.c" "U aa\.c"
8222 dotest conflicts2-142d8 "cat aa.c" ''
8239 dotest conflicts3-1 "${testcvs} -q co -l ." ''
8241 dotest conflicts3-2 "${testcvs} add first-dir" \
8245 dotest conflicts3-3 "${testcvs} -q co -l first-dir" ''
8248 dotest conflicts3-4 "${testcvs} add file1 file2" \
8252 dotest conflicts3-5 "${testcvs} -q ci -m add-them" \
8268 dotest conflicts3-6 "${testcvs} -nq update" \
8272 dotest conflicts3-8 "${testcvs} -q update" \
8275 dotest conflicts3-9 "test -f file2" ''
8278 dotest conflicts3-10 "${testcvs} rm -f file1 file2" \
8282 dotest conflicts3-11 "${testcvs} -q ci -m remove-them" \
8292 dotest conflicts3-12 "${testcvs} -n -q update" \
8295 dotest conflicts3-13 "${testcvs} -q update" \
8302 dotest conflicts3-14 "${testcvs} add sdir" \
8305 dotest conflicts3-14a "${testcvs} add sdir/sfile" \
8308 dotest conflicts3-14b "${testcvs} -q ci -m add" \
8330 dotest conflicts3-15 "${testcvs} -q update" \
8333 dotest conflicts3-15 "${testcvs} -q update" \
8337 dotest conflicts3-16 "${testcvs} -q update" \
8341 dotest conflicts3-16a "${testcvs} -q update first-dir" \
8352 dotest conflicts3-17 "${testcvs} -q update" "${QUESTION} newdir"
8354 dotest conflicts3-18 "${testcvs} -q update" \
8357 dotest conflicts3-19 "${testcvs} -q update" \
8360 dotest conflicts3-20 "${testcvs} -q update first-dir" \
8370 dotest conflicts3-20a "${testcvs} -q co -l first-dir" ''
8373 dotest conflicts3-21 "${testcvs} -q update -d sdir" "U sdir/sfile"
8375 dotest conflicts3-22 "${testcvs} -q update" "${QUESTION} sdir"
8382 dotest conflicts3-23 "${testcvs} -q update -PdA" \
8393 dotest conflicts3-24 "${testcvs} -q update -d sdir" "U sdir/sfile"
8395 dotest conflicts3-25 "${testcvs} rm sdir/sfile" \
8398 dotest conflicts3-26 "${testcvs} ci -m remove sdir/sfile" \
8404 dotest conflicts3-27 "${testcvs} -q update" "${QUESTION} sdir"
8405 dotest conflicts3-28 "${testcvs} -q update -PdA" \
8417 dotest clean-1 "${testcvs} -q co -l ." ''
8419 dotest clean-2 "${testcvs} add first-dir" \
8423 dotest clean-3 "${testcvs} add cleanme.txt" \
8426 dotest clean-4 "${testcvs} -q ci -m clean-3" \
8435 dotest clean-5 "${testcvs} -q update" ''
8437 dotest clean-6 "${testcvs} -q update -C" ''
8440 dotest clean-7 "${testcvs} -q update" 'M cleanme\.txt'
8442 dotest clean-8 "${testcvs} -q update -C" \
8446 dotest clean-9 "cat .#cleanme.txt.1.1" \
8452 dotest clean-10 "${testcvs} -q update cleanme.txt" ''
8453 dotest clean-11 "${testcvs} -q update -C cleanme.txt" ''
8455 dotest clean-12 "${testcvs} -q update cleanme.txt" 'M cleanme\.txt'
8456 dotest clean-13 "${testcvs} -q update -C cleanme.txt" \
8460 dotest clean-14 "cat .#cleanme.txt.1.1" \
8466 dotest clean-15 "${testcvs} -q co -d second-dir first-dir" \
8470 dotest clean-16 "${testcvs} -q ci -m." \
8477 dotest clean-17 "${testcvs} -nq update" \
8485 dotest clean-18 "${testcvs} -q update -C" \
8488 dotest clean-19 "cat .#cleanme.txt.1.1" \
8520 dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/checkoutlist
8532 dotest modules-1d "${testcvs} -q ci -m add-modules" \
8544 dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/checkoutlist
8556 dotest modules-2d "${testcvs} -q ci -m add-modules" \
8569 dotest modules-3 "${testcvs} -q co somedir" ''
8571 dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/checkoutlist
8583 dotest modules-3g "${testcvs} -q ci -m add-modules" \
8602 dotest modules-143 "${testcvs} -q co first-dir" ""
8606 dotest modules-143a "${testcvs} add subdir" \
8611 dotest modules-143b "${testcvs} add ssdir" \
8616 dotest modules-144 "${testcvs} add a b" \
8621 dotest modules-145 "${testcvs} ci -m added" \
8638 dotest modules-146 "${testcvs} -q co CVSROOT" \
8655 dotest modules-147 "${testcvs} -q update" ""
8671 dotest modules-148 "${testcvs} ci -m 'add modules' CVSROOT/modules" \
8683 dotest modules-148a0 "${testcvs} co -c" 'aliasmodule -a first-dir/subdir/a
8695 dotest modules-148a1 "${testcvs} co -s" \
8703 dotest modules-149a1 "${testcvs} co realmodule" "U realmodule/a"
8704 dotest modules-149a2 "test -d realmodule && test -f realmodule/a" ""
8706 dotest modules-149a4 "${testcvs} -q co realmodule" ""
8707 dotest modules-149a5 "echo yes | ${testcvs} release -d realmodule" \
8717 dotest modules-150c "${testcvs} co dirmodule/a" "U dirmodule/a"
8718 dotest modules-150d "test -d dirmodule && test -f dirmodule/a" ""
8720 dotest modules-150f "echo yes | ${testcvs} release -d dirmodule" \
8729 dotest modules-150g1 "${testcvs} co dirmodule/nonexist" \
8739 dotest modules-150h1 "${testcvs} -q co namedmodule" \
8742 dotest modules-150h2 "test -f nameddir/a && test -f nameddir/b" ""
8744 dotest modules-150h3 "${testcvs} -q co namedmodule" 'M nameddir/a'
8746 dotest modules-150h4 "${testcvs} -q co namedmodule" 'U nameddir/a'
8747 dotest modules-150h99 "echo yes | ${testcvs} release -d nameddir" \
8753 dotest modules-151 "${testcvs} co aliasmodule" ""
8756 dotest modules-153 "${testcvs} -q co aliasmodule" "M first-dir/subdir/a"
8763 dotest modules-155a0 "${testcvs} co aliasnested" \
8765 dotest modules-155a1 "test -d first-dir" ''
8766 dotest modules-155a2 "test -d first-dir/subdir" ''
8767 dotest modules-155a3 "test -d first-dir/subdir/ssdir" ''
8769 dotest modules-155a4 "ls" "first-dir" \
8778 dotest modules-155b "${testcvs} -q co world" \
8790 dotest modules-155c1 "${testcvs} -q co first-dir" \
8797 dotest modules-155c2 "${testcvs} add file1 file2" \
8801 dotest modules-155c3 "${testcvs} -q ci -m add-it" \
8817 dotest modules-155c4 "${testcvs} -q co topfiles" \
8820 dotest modules-155c5 "${testcvs} -q co topfiles" ""
8824 dotest modules-155c6 "${testcvs} -q rm -f file1" \
8826 dotest modules-155c7 "${testcvs} -q ci -m remove-it" \
8833 dotest modules-155c8 "${testcvs} -q co topfiles" \
8846 dotest modules2-setup-1 "${testcvs} -q co -l ." ''
8848 dotest modules2-setup-2 \
8855 dotest modules2-setup-3 "${testcvs} add file3" \
8858 dotest modules2-setup-4 "${testcvs} -q ci -m add file3" \
8871 dotest modules2-1 "${testcvs} -q co CVSROOT/modules" \
8884 dotest modules2-2 "${testcvs} -q ci -m add-modules" \
8893 dotest modules2-3 "${testcvs} -q co ampermodule" ''
8894 dotest modules2-4 "test -d ampermodule/first-dir" ''
8895 dotest modules2-5 "test -d ampermodule/second-dir" ''
8916 dotest modules2-ampermod-1 "${testcvs} -q co -n ampermodule" ''
8917 dotest modules2-ampermod-2 "test -d ampermodule/first-dir" ''
8918 dotest modules2-ampermod-3 "test -d ampermodule/second-dir" ''
8929 dotest modules2-ampermod-4 "${testcvs} -q co -n -d newname ampermodule" ''
8930 dotest modules2-ampermod-5 "test -d newname/first-dir" ''
8931 dotest modules2-ampermod-6 "test -d newname/second-dir" ''
8939 dotest modules2-9 "${testcvs} co ampermodule" \
8944 dotest modules2-10 "${testcvs} add first-dir/amper1" \
8952 dotest modules2-12 "${testcvs} co ampermodule" \
8958 dotest modules2-13 "${testcvs} -q ci -m add-it ampermodule" \
8969 dotest modules2-13 "${testcvs} -q ci -m add-it" \
8984 dotest modules2-14 "${testcvs} co combmodule" \
8988 dotest modules2-15 "test -f combmodule/file3" ""
8989 dotest modules2-16 "test -f combmodule/first-dir/amper1" ""
8999 dotest modules2-17 "${testcvs} update -d" \
9003 dotest modules2-18 "${testcvs} -q co combmodule" \
9005 dotest modules2-19 "test -f combmodule/first-dir/amper1" ""
9013 dotest modules2-20 "${testcvs} co ampdirmod" \
9017 dotest modules2-21 "test -f newdir/first-dir/amper1" ""
9018 dotest modules2-22 "test -d newdir/second-dir" ""
9029 dotest modules2-nestedrename-1 "${testcvs} -q co messymod" \
9031 dotest modules2-nestedrename-2 "test -d messymod/sdir" ''
9032 dotest modules2-nestedrename-3 "test -d messymod/sdir/CVS" ''
9033 dotest modules2-nestedrename-4 "test -d messymod/sdir/child" ''
9034 dotest modules2-nestedrename-5 "test -d messymod/sdir/child/CVS" ''
9041 dotest modules2-ampertag-setup-1 \
9044 dotest modules2-ampertag-1 "${testcvs} -q co -rtag ampermodule" \
9050 dotest modules2-ampertag-2 "test -d ampermodule/second-dir" ''
9051 dotest modules2-ampertag-3 "test -d ampermodule/second-dir/CVS" ''
9061 # dotest modules2-tagfiles-setup-1 \
9064 dotest modules2-tagfiles-1 "${testcvs} -q co -rtag messymod" \
9069 dotest modules2-tagfiles-2 "cat messymod/sdir/CVS/Tag" 'Ttag'
9079 dotest modules2-a0.5 "${testcvs} -q co CVSROOT/modules" \
9083 dotest modules2-a0 "${testcvs} -q ci -m add-modules" \
9109 dotest modules3-0 "${testcvs} -q co -l ." ''
9111 dotest modules3-1 "${testcvs} add first-dir" \
9116 dotest modules3-2 "${testcvs} add file1" \
9119 dotest modules3-3 "${testcvs} -q ci -m add-it" \
9128 dotest modules3-4 "${testcvs} -q update -d CVSROOT" \
9140 dotest modules3-5 "${testcvs} -q ci -m add-modules" \
9148 dotest modules3-6 "${testcvs} -q co bigmod" ''
9150 dotest modules3-7 "${testcvs} -q co bigmod" 'U first-dir/file1'
9160 dotest modules3-7a \
9169 dotest modules3-7b "${testcvs} co second-dir" \
9178 dotest modules3-7-workaround1 "${testcvs} add suba" \
9182 dotest modules3-7-workaround2 "${testcvs} add subb" \
9189 dotest modules3-7c "${testcvs} add fileb" \
9192 dotest modules3-7d "${testcvs} -q ci -m add-it" \
9204 dotest modules3-8 "${testcvs} -q co namednest" \
9206 dotest modules3-9 "test -f src/sub/dir/file1" ''
9215 dotest modules3-10 "${testcvs} -q co nestdeeper" \
9217 dotest modules3-11 "test -f src/sub1/sub2/sub3/dir/file1" ''
9245 dotest modules3-12 "${testcvs} -q co path/in/modules" \
9247 dotest modules3-13 "test -f path/in/modules/first-dir/file1" ''
9253 dotest modules3-14 \
9267 dotest modules3-16 "${testcvs} -q co another/path/test" \
9269 dotest modules3-17 "cat another/path/test/file1" 'file1'
9282 dotest modules4-1 "${testcvs} -q co -l ." ''
9284 dotest modules4-2 "${testcvs} add first-dir" \
9289 dotest modules4-3 "${testcvs} add subdir" \
9293 dotest modules4-4 "${testcvs} add file1" \
9298 dotest modules4-5 "${testcvs} add subdir/file2" \
9302 dotest modules4-6 "${testcvs} -q ci -m add-it" \
9318 dotest modules4-7 "${testcvs} -q update -d CVSROOT" \
9326 dotest modules4-8 "${testcvs} -q ci -m add-modules" \
9337 dotest modules4-9 "${testcvs} -q co all" \
9342 dotest modules4-10 "${testcvs} -q co some" "U first-dir/file1"
9348 dotest modules4-11a "${testcvs} -q co somewhat" "U first-dir/file1"
9355 dotest modules4-11a "${testcvs} -q co somewhat" \
9364 dotest modules4-12 "${testcvs} rtag tag some" \
9369 dotest modules4-13 "${testcvs} log file2" "
9398 dotest modules5-1 "${testcvs} -q co first-dir" ""
9401 dotest modules5-2 "${testcvs} add subdir" \
9405 dotest modules5-3 "${testcvs} add ssdir" \
9408 dotest modules5-4 "${testcvs} add a b" \
9413 dotest modules5-5 "${testcvs} ci -m added" \
9430 dotest modules5-6 "${testcvs} -q co CVSROOT" \
9459 dotest modules5-7 "${testcvs} ci -m 'add modules' CVSROOT/modules" \
9471 dotest modules5-8 "${testcvs} co realmodule" \
9477 dotest modules5-8 "${testcvs} co realmodule" \
9483 dotest modules5-9 "test -d realmodule && test -f realmodule/a" ""
9486 dotest modules5-11 "${testcvs} -q co realmodule" \
9489 dotest modules5-12 "${testcvs} -q update" \
9494 dotest modules5-13 "${testcvs} -q ci -m." \
9503 dotest modules5-11 "${testcvs} -q co realmodule" \
9506 dotest modules5-12 "${testcvs} -q update" \
9511 dotest modules5-13 "${testcvs} -q ci -m." \
9520 dotest modules5-14 "echo yes | ${testcvs} release -d realmodule" \
9523 dotest modules5-15 "${testcvs} -q rtag -Dnow MYTAG realmodule" \
9529 dotest modules5-16 "${testcvs} -q export -r MYTAG realmodule" \
9534 dotest modules5-16 "${testcvs} -q export -r MYTAG realmodule" \
9549 dotest modules5-18 "${testcvs} co dirmodule/a" \
9554 dotest modules5-19 "test -d dirmodule && test -f dirmodule/a" ""
9556 dotest modules5-21 "echo yes | ${testcvs} release -d dirmodule" \
9566 dotest modules5-22 "${testcvs} co dirmodule/nonexist" \
9580 dotest modules5-24 "${testcvs} -q co namedmodule" \
9585 dotest modules5-25 "test -f nameddir/a && test -f nameddir/b" ""
9590 dotest modules5-26 "${testcvs} -q co namedmodule" \
9598 dotest modules5-27 "${testcvs} -q co namedmodule" \
9605 dotest modules5-28 "echo yes | ${testcvs} release -d nameddir" \
9621 dotest mtfr-1 "${testcvs} -Q co CVSROOT" ''
9624 dotest mtfr-2 "${testcvs} -Q ci -m. checkoutlist" \
9631 dotest mtfr-3 "echo $CVSROOT_DIRNAME/CVSROOT/.#[0-9]*" \
9680 dotest cvsadm-setup-1 "${testcvs} -q co CVSROOT/config" \
9684 dotest cvsadm-setup-2 "${testcvs} -q ci -m yes-top-level" \
9695 dotest cvsadm-1 "${testcvs} co CVSROOT/modules" \
9702 echo "${CVSROOT_DIRNAME}/." > ${TESTDIR}/dotest.abs
9703 echo "." > ${TESTDIR}/dotest.rel
9704 if cmp ${TESTDIR}/dotest.abs CVS/Repository >/dev/null 2>&1; then
9706 elif cmp ${TESTDIR}/dotest.rel CVS/Repository >/dev/null 2>&1; then
9715 dotest cvsadm-1a "cat CVS/Root" ${REP}
9716 dotest cvsadm-1b "cat CVS/Repository" \
9718 dotest cvsadm-1c "cat CVSROOT/CVS/Root" ${REP}
9719 dotest cvsadm-1d "cat CVSROOT/CVS/Repository" \
9738 dotest cvsadm-1e "${testcvs} ci -m add-modules" \
9751 dotest cvsadm-2 "${testcvs} -q co -l ." ''
9758 dotest cvsadm-2a "${testcvs} add mod1 mod1-2 mod2 mod2/sub2 mod2-2 mod2-2/sub2-2" \
9771 dotest cvsadm-2aa "${testcvs} add mod1/file1 mod1-2/file1-2 mod2/sub2/file2 mod2-2/sub2-2/file2-2" \
9778 dotest cvsadm-2b "${testcvs} ci -m yup mod1 mod1-2 mod2 mod2-2" \
9822 dotest cvsadm-3 "${testcvs} co 1mod" \
9825 dotest cvsadm-3b "cat CVS/Repository" \
9827 dotest cvsadm-3d "cat 1mod/CVS/Repository" \
9831 dotest cvsadm-4 "${testcvs} co 2mod" \
9834 dotest cvsadm-4b "cat CVS/Repository" \
9836 dotest cvsadm-4d "cat 2mod/CVS/Repository" \
9840 dotest cvsadm-5 "${testcvs} co 1d1mod" \
9843 dotest cvsadm-5b "cat CVS/Repository" \
9845 dotest cvsadm-5d "cat dir1d1/CVS/Repository" \
9849 dotest cvsadm-6 "${testcvs} co 1d2mod" \
9852 dotest cvsadm-6b "cat CVS/Repository" \
9854 dotest cvsadm-6d "cat dir1d2/CVS/Repository" \
9858 dotest cvsadm-7 "${testcvs} co 2d1mod" \
9861 dotest cvsadm-7b "cat CVS/Repository" \
9863 dotest cvsadm-7d "cat dir2d1/CVS/Repository" \
9865 dotest cvsadm-7f "cat dir2d1/sub2d1/CVS/Repository" \
9869 dotest cvsadm-8 "${testcvs} co 2d2mod" \
9872 dotest cvsadm-8b "cat CVS/Repository" \
9874 dotest cvsadm-8d "cat dir2d2/CVS/Repository" \
9876 dotest cvsadm-8f "cat dir2d2/sub2d2/CVS/Repository" \
9887 dotest cvsadm-9 "${testcvs} co 1mod 1mod-2" \
9893 dotest cvsadm-9b "cat CVS/Repository" \
9896 dotest cvsadm-9d "cat 1mod/CVS/Repository" \
9899 dotest cvsadm-9f "cat 1mod-2/CVS/Repository" \
9904 dotest cvsadm-10 "${testcvs} co 1mod 2mod" \
9910 dotest cvsadm-10b "cat CVS/Repository" \
9913 dotest cvsadm-10d "cat 1mod/CVS/Repository" \
9916 dotest cvsadm-10f "cat 2mod/CVS/Repository" \
9920 dotest cvsadm-11 "${testcvs} co 1mod 1d1mod" \
9926 dotest cvsadm-11b "cat CVS/Repository" \
9929 dotest cvsadm-11d "cat 1mod/CVS/Repository" \
9932 dotest cvsadm-11f "cat dir1d1/CVS/Repository" \
9936 dotest cvsadm-12 "${testcvs} co 1mod 1d2mod" \
9942 dotest cvsadm-12b "cat CVS/Repository" \
9945 dotest cvsadm-12d "cat 1mod/CVS/Repository" \
9948 dotest cvsadm-12f "cat dir1d2/CVS/Repository" \
9952 dotest cvsadm-13 "${testcvs} co 1mod 2d1mod" \
9958 dotest cvsadm-13b "cat CVS/Repository" \
9961 dotest cvsadm-13d "cat 1mod/CVS/Repository" \
9964 dotest cvsadm-13f "cat dir2d1/CVS/Repository" \
9966 dotest cvsadm-13h "cat dir2d1/sub2d1/CVS/Repository" \
9970 dotest cvsadm-14 "${testcvs} co 1mod 2d2mod" \
9976 dotest cvsadm-14b "cat CVS/Repository" \
9979 dotest cvsadm-14d "cat 1mod/CVS/Repository" \
9982 dotest cvsadm-14f "cat dir2d2/CVS/Repository" \
9984 dotest cvsadm-14h "cat dir2d2/sub2d2/CVS/Repository" \
9991 dotest cvsadm-15 "${testcvs} co 2mod 2mod-2" \
9997 dotest cvsadm-15b "cat CVS/Repository" \
10000 dotest cvsadm-15d "cat 2mod/CVS/Repository" \
10003 dotest cvsadm-15f "cat 2mod-2/CVS/Repository" \
10008 dotest cvsadm-16 "${testcvs} co 2mod 1d1mod" \
10014 dotest cvsadm-16b "cat CVS/Repository" \
10017 dotest cvsadm-16d "cat 2mod/CVS/Repository" \
10020 dotest cvsadm-16f "cat dir1d1/CVS/Repository" \
10024 dotest cvsadm-17 "${testcvs} co 2mod 1d2mod" \
10030 dotest cvsadm-17b "cat CVS/Repository" \
10033 dotest cvsadm-17d "cat 2mod/CVS/Repository" \
10036 dotest cvsadm-17f "cat dir1d2/CVS/Repository" \
10040 dotest cvsadm-18 "${testcvs} co 2mod 2d1mod" \
10046 dotest cvsadm-18b "cat CVS/Repository" \
10049 dotest cvsadm-18d "cat 2mod/CVS/Repository" \
10052 dotest cvsadm-18f "cat dir2d1/CVS/Repository" \
10054 dotest cvsadm-18h "cat dir2d1/sub2d1/CVS/Repository" \
10058 dotest cvsadm-19 "${testcvs} co 2mod 2d2mod" \
10064 dotest cvsadm-19b "cat CVS/Repository" \
10067 dotest cvsadm-19d "cat 2mod/CVS/Repository" \
10070 dotest cvsadm-19f "cat dir2d2/CVS/Repository" \
10072 dotest cvsadm-19h "cat dir2d2/sub2d2/CVS/Repository" \
10079 dotest cvsadm-20 "${testcvs} co 1d1mod 1d1mod-2" \
10085 dotest cvsadm-20b "cat CVS/Repository" \
10088 dotest cvsadm-20d "cat dir1d1/CVS/Repository" \
10091 dotest cvsadm-20f "cat dir1d1-2/CVS/Repository" \
10095 dotest cvsadm-21 "${testcvs} co 1d1mod 1d2mod" \
10101 dotest cvsadm-21b "cat CVS/Repository" \
10104 dotest cvsadm-21d "cat dir1d1/CVS/Repository" \
10107 dotest cvsadm-21f "cat dir1d2/CVS/Repository" \
10111 dotest cvsadm-22 "${testcvs} co 1d1mod 2d1mod" \
10117 dotest cvsadm-22b "cat CVS/Repository" \
10120 dotest cvsadm-22d "cat dir1d1/CVS/Repository" \
10123 dotest cvsadm-22f "cat dir2d1/CVS/Repository" \
10125 dotest cvsadm-22h "cat dir2d1/sub2d1/CVS/Repository" \
10129 dotest cvsadm-23 "${testcvs} co 1d1mod 2d2mod" \
10135 dotest cvsadm-23b "cat CVS/Repository" \
10138 dotest cvsadm-23d "cat dir1d1/CVS/Repository" \
10141 dotest cvsadm-23f "cat dir2d2/CVS/Repository" \
10143 dotest cvsadm-23h "cat dir2d2/sub2d2/CVS/Repository" \
10150 dotest cvsadm-24 "${testcvs} co 1d2mod 1d2mod-2" \
10156 dotest cvsadm-24b "cat CVS/Repository" \
10159 dotest cvsadm-24d "cat dir1d2/CVS/Repository" \
10162 dotest cvsadm-24f "cat dir1d2-2/CVS/Repository" \
10166 dotest cvsadm-25 "${testcvs} co 1d2mod 2d1mod" \
10172 dotest cvsadm-25b "cat CVS/Repository" \
10175 dotest cvsadm-25d "cat dir1d2/CVS/Repository" \
10178 dotest cvsadm-25f "cat dir2d1/CVS/Repository" \
10180 dotest cvsadm-25h "cat dir2d1/sub2d1/CVS/Repository" \
10184 dotest cvsadm-26 "${testcvs} co 1d2mod 2d2mod" \
10190 dotest cvsadm-26b "cat CVS/Repository" \
10193 dotest cvsadm-26d "cat dir1d2/CVS/Repository" \
10196 dotest cvsadm-26f "cat dir2d2/CVS/Repository" \
10198 dotest cvsadm-26h "cat dir2d2/sub2d2/CVS/Repository" \
10205 dotest cvsadm-27 "${testcvs} co 2d1mod 2d1mod-2" \
10211 dotest cvsadm-27b "cat CVS/Repository" \
10214 dotest cvsadm-27d "cat dir2d1/CVS/Repository" \
10216 dotest cvsadm-27f "cat dir2d1/sub2d1/CVS/Repository" \
10219 dotest cvsadm-27h "cat dir2d1-2/CVS/Repository" \
10221 dotest cvsadm-27j "cat dir2d1-2/sub2d1-2/CVS/Repository" \
10225 dotest cvsadm-28 "${testcvs} co 2d1mod 2d2mod" \
10231 dotest cvsadm-28b "cat CVS/Repository" \
10234 dotest cvsadm-28d "cat dir2d1/CVS/Repository" \
10236 dotest cvsadm-28f "cat dir2d1/sub2d1/CVS/Repository" \
10239 dotest cvsadm-28h "cat dir2d2/CVS/Repository" \
10241 dotest cvsadm-28j "cat dir2d2/sub2d2/CVS/Repository" \
10248 dotest cvsadm-29 "${testcvs} co 2d2mod 2d2mod-2" \
10254 dotest cvsadm-29b "cat CVS/Repository" \
10257 dotest cvsadm-29d "cat dir2d2/CVS/Repository" \
10259 dotest cvsadm-29f "cat dir2d2/sub2d2/CVS/Repository" \
10262 dotest cvsadm-29h "cat dir2d2-2/CVS/Repository" \
10264 dotest cvsadm-29j "cat dir2d2-2/sub2d2-2/CVS/Repository" \
10273 dotest cvsadm-1d3 "${testcvs} co -d dir 1mod" \
10276 dotest cvsadm-1d3b "cat CVS/Repository" \
10278 dotest cvsadm-1d3d "cat dir/CVS/Repository" \
10282 dotest cvsadm-1d4 "${testcvs} co -d dir 2mod" \
10285 dotest cvsadm-1d4b "cat CVS/Repository" \
10287 dotest cvsadm-1d4d "cat dir/CVS/Repository" \
10291 dotest cvsadm-1d5 "${testcvs} co -d dir 1d1mod" \
10294 dotest cvsadm-1d5b "cat CVS/Repository" \
10296 dotest cvsadm-1d5d "cat dir/CVS/Repository" \
10300 dotest cvsadm-1d6 "${testcvs} co -d dir 1d2mod" \
10303 dotest cvsadm-1d6b "cat CVS/Repository" \
10305 dotest cvsadm-1d6d "cat dir/CVS/Repository" \
10309 dotest cvsadm-1d7 "${testcvs} co -d dir 2d1mod" \
10312 dotest cvsadm-1d7b "cat CVS/Repository" \
10314 dotest cvsadm-1d7d "cat dir/CVS/Repository" \
10318 dotest cvsadm-1d8 "${testcvs} co -d dir 2d2mod" \
10321 dotest cvsadm-1d8b "cat CVS/Repository" \
10323 dotest cvsadm-1d8d "cat dir/CVS/Repository" \
10333 dotest cvsadm-1d9 "${testcvs} co -d dir 1mod 1mod-2" \
10339 dotest cvsadm-1d9b "cat CVS/Repository" \
10342 dotest cvsadm-1d9d "cat dir/CVS/Repository" \
10345 dotest cvsadm-1d9f "cat dir/1mod/CVS/Repository" \
10348 dotest cvsadm-1d9h "cat dir/1mod-2/CVS/Repository" \
10353 dotest cvsadm-1d10 "${testcvs} co -d dir 1mod 2mod" \
10358 dotest cvsadm-1d10b "cat CVS/Repository" \
10361 dotest cvsadm-1d10d "cat dir/CVS/Repository" \
10364 dotest cvsadm-1d10f "cat dir/1mod/CVS/Repository" \
10367 dotest cvsadm-1d10h "cat dir/2mod/CVS/Repository" \
10371 dotest cvsadm-1d11 "${testcvs} co -d dir 1mod 1d1mod" \
10376 dotest cvsadm-1d11b "cat CVS/Repository" \
10379 dotest cvsadm-1d11d "cat dir/CVS/Repository" \
10382 dotest cvsadm-1d11f "cat dir/1mod/CVS/Repository" \
10385 dotest cvsadm-1d11h "cat dir/dir1d1/CVS/Repository" \
10389 dotest cvsadm-1d12 "${testcvs} co -d dir 1mod 1d2mod" \
10394 dotest cvsadm-1d12b "cat CVS/Repository" \
10397 dotest cvsadm-1d12d "cat dir/CVS/Repository" \
10400 dotest cvsadm-1d12f "cat dir/1mod/CVS/Repository" \
10403 dotest cvsadm-1d12h "cat dir/dir1d2/CVS/Repository" \
10407 dotest cvsadm-1d13 "${testcvs} co -d dir 1mod 2d1mod" \
10412 dotest cvsadm-1d13b "cat CVS/Repository" \
10415 dotest cvsadm-1d13d "cat dir/CVS/Repository" \
10418 dotest cvsadm-1d13f "cat dir/1mod/CVS/Repository" \
10421 dotest cvsadm-1d13h "cat dir/dir2d1/CVS/Repository" \
10423 dotest cvsadm-1d13j "cat dir/dir2d1/sub2d1/CVS/Repository" \
10427 dotest cvsadm-1d14 "${testcvs} co -d dir 1mod 2d2mod" \
10432 dotest cvsadm-1d14b "cat CVS/Repository" \
10435 dotest cvsadm-1d14d "cat dir/CVS/Repository" \
10438 dotest cvsadm-1d14f "cat dir/1mod/CVS/Repository" \
10441 dotest cvsadm-1d14h "cat dir/dir2d2/CVS/Repository" \
10443 dotest cvsadm-1d14j "cat dir/dir2d2/sub2d2/CVS/Repository" \
10450 dotest cvsadm-1d15 "${testcvs} co -d dir 2mod 2mod-2" \
10455 dotest cvsadm-1d15b "cat CVS/Repository" \
10458 dotest cvsadm-1d15d "cat dir/CVS/Repository" \
10461 dotest cvsadm-1d15f "cat dir/2mod/CVS/Repository" \
10464 dotest cvsadm-1d15h "cat dir/2mod-2/CVS/Repository" \
10468 dotest cvsadm-1d16 "${testcvs} co -d dir 2mod 1d1mod" \
10473 dotest cvsadm-1d16b "cat CVS/Repository" \
10476 dotest cvsadm-1d16d "cat dir/CVS/Repository" \
10479 dotest cvsadm-1d16f "cat dir/2mod/CVS/Repository" \
10482 dotest cvsadm-1d16h "cat dir/dir1d1/CVS/Repository" \
10486 dotest cvsadm-1d17 "${testcvs} co -d dir 2mod 1d2mod" \
10491 dotest cvsadm-1d17b "cat CVS/Repository" \
10494 dotest cvsadm-1d17d "cat dir/CVS/Repository" \
10497 dotest cvsadm-1d17f "cat dir/2mod/CVS/Repository" \
10500 dotest cvsadm-1d17h "cat dir/dir1d2/CVS/Repository" \
10504 dotest cvsadm-1d18 "${testcvs} co -d dir 2mod 2d1mod" \
10509 dotest cvsadm-1d18b "cat CVS/Repository" \
10512 dotest cvsadm-1d18d "cat dir/CVS/Repository" \
10515 dotest cvsadm-1d18f "cat dir/2mod/CVS/Repository" \
10518 dotest cvsadm-1d18h "cat dir/dir2d1/CVS/Repository" \
10520 dotest cvsadm-1d18j "cat dir/dir2d1/sub2d1/CVS/Repository" \
10524 dotest cvsadm-1d19 "${testcvs} co -d dir 2mod 2d2mod" \
10529 dotest cvsadm-1d19b "cat CVS/Repository" \
10532 dotest cvsadm-1d19d "cat dir/CVS/Repository" \
10535 dotest cvsadm-1d19f "cat dir/2mod/CVS/Repository" \
10538 dotest cvsadm-1d19h "cat dir/dir2d2/CVS/Repository" \
10540 dotest cvsadm-1d19j "cat dir/dir2d2/sub2d2/CVS/Repository" \
10547 dotest cvsadm-1d20 "${testcvs} co -d dir 1d1mod 1d1mod-2" \
10552 dotest cvsadm-1d20b "cat CVS/Repository" \
10555 dotest cvsadm-1d20d "cat dir/CVS/Repository" \
10558 dotest cvsadm-1d20f "cat dir/dir1d1/CVS/Repository" \
10561 dotest cvsadm-1d20h "cat dir/dir1d1-2/CVS/Repository" \
10565 dotest cvsadm-1d21 "${testcvs} co -d dir 1d1mod 1d2mod" \
10570 dotest cvsadm-1d21b "cat CVS/Repository" \
10573 dotest cvsadm-1d21d "cat dir/CVS/Repository" \
10576 dotest cvsadm-1d21f "cat dir/dir1d1/CVS/Repository" \
10579 dotest cvsadm-1d21h "cat dir/dir1d2/CVS/Repository" \
10583 dotest cvsadm-1d22 "${testcvs} co -d dir 1d1mod 2d1mod" \
10588 dotest cvsadm-1d22b "cat CVS/Repository" \
10591 dotest cvsadm-1d22d "cat dir/CVS/Repository" \
10594 dotest cvsadm-1d22f "cat dir/dir1d1/CVS/Repository" \
10597 dotest cvsadm-1d22h "cat dir/dir2d1/CVS/Repository" \
10599 dotest cvsadm-1d22j "cat dir/dir2d1/sub2d1/CVS/Repository" \
10603 dotest cvsadm-1d23 "${testcvs} co -d dir 1d1mod 2d2mod" \
10608 dotest cvsadm-1d23b "cat CVS/Repository" \
10611 dotest cvsadm-1d23d "cat dir/CVS/Repository" \
10614 dotest cvsadm-1d23f "cat dir/dir1d1/CVS/Repository" \
10617 dotest cvsadm-1d23h "cat dir/dir2d2/CVS/Repository" \
10619 dotest cvsadm-1d23j "cat dir/dir2d2/sub2d2/CVS/Repository" \
10626 dotest cvsadm-1d24 "${testcvs} co -d dir 1d2mod 1d2mod-2" \
10631 dotest cvsadm-1d24b "cat CVS/Repository" \
10634 dotest cvsadm-1d24d "cat dir/CVS/Repository" \
10637 dotest cvsadm-1d24f "cat dir/dir1d2/CVS/Repository" \
10640 dotest cvsadm-1d24h "cat dir/dir1d2-2/CVS/Repository" \
10644 dotest cvsadm-1d25 "${testcvs} co -d dir 1d2mod 2d1mod" \
10649 dotest cvsadm-1d25b "cat CVS/Repository" \
10652 dotest cvsadm-1d25d "cat dir/CVS/Repository" \
10655 dotest cvsadm-1d25f "cat dir/dir1d2/CVS/Repository" \
10658 dotest cvsadm-1d25h "cat dir/dir2d1/CVS/Repository" \
10660 dotest cvsadm-1d25j "cat dir/dir2d1/sub2d1/CVS/Repository" \
10664 dotest cvsadm-1d26 "${testcvs} co -d dir 1d2mod 2d2mod" \
10669 dotest cvsadm-1d26b "cat CVS/Repository" \
10672 dotest cvsadm-1d26d "cat dir/CVS/Repository" \
10675 dotest cvsadm-1d26f "cat dir/dir1d2/CVS/Repository" \
10678 dotest cvsadm-1d26h "cat dir/dir2d2/CVS/Repository" \
10680 dotest cvsadm-1d26j "cat dir/dir2d2/sub2d2/CVS/Repository" \
10687 dotest cvsadm-1d27 "${testcvs} co -d dir 2d1mod 2d1mod-2" \
10692 dotest cvsadm-1d27b "cat CVS/Repository" \
10695 dotest cvsadm-1d27d "cat dir/CVS/Repository" \
10698 dotest cvsadm-1d27f "cat dir/dir2d1/CVS/Repository" \
10700 dotest cvsadm-1d27h "cat dir/dir2d1/sub2d1/CVS/Repository" \
10703 dotest cvsadm-1d27j "cat dir/dir2d1-2/CVS/Repository" \
10705 dotest cvsadm-1d27l "cat dir/dir2d1-2/sub2d1-2/CVS/Repository" \
10709 dotest cvsadm-1d28 "${testcvs} co -d dir 2d1mod 2d2mod" \
10714 dotest cvsadm-1d28b "cat CVS/Repository" \
10717 dotest cvsadm-1d28d "cat dir/CVS/Repository" \
10720 dotest cvsadm-1d28f "cat dir/dir2d1/CVS/Repository" \
10722 dotest cvsadm-1d28h "cat dir/dir2d1/sub2d1/CVS/Repository" \
10725 dotest cvsadm-1d28j "cat dir/dir2d2/CVS/Repository" \
10727 dotest cvsadm-1d28l "cat dir/dir2d2/sub2d2/CVS/Repository" \
10734 dotest cvsadm-1d29 "${testcvs} co -d dir 2d2mod 2d2mod-2" \
10739 dotest cvsadm-1d29b "cat CVS/Repository" \
10742 dotest cvsadm-1d29d "cat dir/CVS/Repository" \
10745 dotest cvsadm-1d29f "cat dir/dir2d2/CVS/Repository" \
10747 dotest cvsadm-1d29h "cat dir/dir2d2/sub2d2/CVS/Repository" \
10750 dotest cvsadm-1d29j "cat dir/dir2d2-2/CVS/Repository" \
10752 dotest cvsadm-1d29l "cat dir/dir2d2-2/sub2d2-2/CVS/Repository" \
10770 dotest cvsadm-2d3 "${testcvs} co -d dir/dir2 1mod" \
10773 dotest cvsadm-2d3b "cat CVS/Repository" \
10776 dotest cvsadm-2d3f "cat dir/dir2/CVS/Repository" \
10781 dotest cvsadm-2d4 "${testcvs} co -d dir/dir2 2mod" \
10784 dotest cvsadm-2d4b "cat CVS/Repository" \
10786 dotest cvsadm-2d4f "cat dir/dir2/CVS/Repository" \
10791 dotest cvsadm-2d5 "${testcvs} co -d dir/dir2 1d1mod" \
10794 dotest cvsadm-2d5b "cat CVS/Repository" \
10796 dotest cvsadm-2d5f "cat dir/dir2/CVS/Repository" \
10801 dotest cvsadm-2d6 "${testcvs} co -d dir/dir2 1d2mod" \
10804 dotest cvsadm-2d6b "cat CVS/Repository" \
10806 dotest cvsadm-2d6f "cat dir/dir2/CVS/Repository" \
10811 dotest cvsadm-2d7 "${testcvs} co -d dir/dir2 2d1mod" \
10814 dotest cvsadm-2d7b "cat CVS/Repository" \
10816 dotest cvsadm-2d7f "cat dir/dir2/CVS/Repository" \
10821 dotest cvsadm-2d8 "${testcvs} co -d dir/dir2 2d2mod" \
10824 dotest cvsadm-2d8b "cat CVS/Repository" \
10826 dotest cvsadm-2d8f "cat dir/dir2/CVS/Repository" \
10835 dotest cvsadm-N3 "${testcvs} co -N 1mod" \
10838 dotest cvsadm-N3b "cat CVS/Repository" \
10840 dotest cvsadm-N3d "cat 1mod/CVS/Repository" \
10844 dotest cvsadm-N4 "${testcvs} co -N 2mod" \
10847 dotest cvsadm-N4b "cat CVS/Repository" \
10849 dotest cvsadm-N4d "cat 2mod/CVS/Repository" \
10853 dotest cvsadm-N5 "${testcvs} co -N 1d1mod" \
10856 dotest cvsadm-N5b "cat CVS/Repository" \
10858 dotest cvsadm-N5d "cat dir1d1/CVS/Repository" \
10862 dotest cvsadm-N6 "${testcvs} co -N 1d2mod" \
10865 dotest cvsadm-N6b "cat CVS/Repository" \
10867 dotest cvsadm-N6d "cat dir1d2/CVS/Repository" \
10871 dotest cvsadm-N7 "${testcvs} co -N 2d1mod" \
10874 dotest cvsadm-N7b "cat CVS/Repository" \
10876 dotest cvsadm-N7d "cat dir2d1/CVS/Repository" \
10878 dotest cvsadm-N7f "cat dir2d1/sub2d1/CVS/Repository" \
10882 dotest cvsadm-N8 "${testcvs} co -N 2d2mod" \
10885 dotest cvsadm-N8b "cat CVS/Repository" \
10887 dotest cvsadm-N8d "cat dir2d2/CVS/Repository" \
10889 dotest cvsadm-N8f "cat dir2d2/sub2d2/CVS/Repository" \
10895 dotest cvsadm-N1d3 "${testcvs} co -N -d dir 1mod" \
10898 dotest cvsadm-N1d3b "cat CVS/Repository" \
10900 dotest cvsadm-N1d3d "cat dir/CVS/Repository" \
10902 dotest cvsadm-N1d3f "cat dir/1mod/CVS/Repository" \
10906 dotest cvsadm-N1d4 "${testcvs} co -N -d dir 2mod" \
10909 dotest cvsadm-N1d4b "cat CVS/Repository" \
10911 dotest cvsadm-N1d4d "cat dir/CVS/Repository" \
10913 dotest cvsadm-N1d4f "cat dir/2mod/CVS/Repository" \
10917 dotest cvsadm-N1d5 "${testcvs} co -N -d dir 1d1mod" \
10920 dotest cvsadm-N1d5b "cat CVS/Repository" \
10922 dotest cvsadm-N1d5d "cat dir/CVS/Repository" \
10924 dotest cvsadm-N1d5d "cat dir/dir1d1/CVS/Repository" \
10928 dotest cvsadm-N1d6 "${testcvs} co -N -d dir 1d2mod" \
10931 dotest cvsadm-N1d6b "cat CVS/Repository" \
10933 dotest cvsadm-N1d6d "cat dir/CVS/Repository" \
10935 dotest cvsadm-N1d6f "cat dir/dir1d2/CVS/Repository" \
10939 dotest cvsadm-N1d7 "${testcvs} co -N -d dir 2d1mod" \
10942 dotest cvsadm-N1d7b "cat CVS/Repository" \
10944 dotest cvsadm-N1d7d "cat dir/CVS/Repository" \
10946 dotest cvsadm-N1d7f "cat dir/dir2d1/CVS/Repository" \
10948 dotest cvsadm-N1d7h "cat dir/dir2d1/sub2d1/CVS/Repository" \
10952 dotest cvsadm-N1d8 "${testcvs} co -N -d dir 2d2mod" \
10955 dotest cvsadm-N1d8b "cat CVS/Repository" \
10957 dotest cvsadm-N1d8d "cat dir/CVS/Repository" \
10959 dotest cvsadm-N1d8d "cat dir/dir2d2/CVS/Repository" \
10961 dotest cvsadm-N1d8d "cat dir/dir2d2/sub2d2/CVS/Repository" \
10968 dotest cvsadm-N2d3 "${testcvs} co -N -d dir/dir2 1mod" \
10971 dotest cvsadm-N2d3b "cat CVS/Repository" \
10973 dotest cvsadm-N2d3f "cat dir/dir2/CVS/Repository" \
10975 dotest cvsadm-N2d3h "cat dir/dir2/1mod/CVS/Repository" \
10980 dotest cvsadm-N2d4 "${testcvs} co -N -d dir/dir2 2mod" \
10983 dotest cvsadm-N2d4b "cat CVS/Repository" \
10985 dotest cvsadm-N2d4f "cat dir/dir2/CVS/Repository" \
10987 dotest cvsadm-N2d4h "cat dir/dir2/2mod/CVS/Repository" \
10992 dotest cvsadm-N2d5 "${testcvs} co -N -d dir/dir2 1d1mod" \
10995 dotest cvsadm-N2d5b "cat CVS/Repository" \
10997 dotest cvsadm-N2d5f "cat dir/dir2/CVS/Repository" \
10999 dotest cvsadm-N2d5h "cat dir/dir2/dir1d1/CVS/Repository" \
11004 dotest cvsadm-N2d6 "${testcvs} co -N -d dir/dir2 1d2mod" \
11007 dotest cvsadm-N2d6b "cat CVS/Repository" \
11009 dotest cvsadm-N2d6f "cat dir/dir2/CVS/Repository" \
11011 dotest cvsadm-N2d6h "cat dir/dir2/dir1d2/CVS/Repository" \
11016 dotest cvsadm-N2d7 "${testcvs} co -N -d dir/dir2 2d1mod" \
11019 dotest cvsadm-N2d7b "cat CVS/Repository" \
11021 dotest cvsadm-N2d7f "cat dir/dir2/CVS/Repository" \
11023 dotest cvsadm-N2d7g "cat dir/dir2/dir2d1/CVS/Repository" \
11025 dotest cvsadm-N2d7h "cat dir/dir2/dir2d1/sub2d1/CVS/Repository" \
11030 dotest cvsadm-N2d8 "${testcvs} co -N -d dir/dir2 2d2mod" \
11033 dotest cvsadm-N2d8b "cat CVS/Repository" \
11035 dotest cvsadm-N2d8f "cat dir/dir2/CVS/Repository" \
11037 dotest cvsadm-N2d8h "cat dir/dir2/dir2d2/CVS/Repository" \
11039 dotest cvsadm-N2d8j "cat dir/dir2/dir2d2/sub2d2/CVS/Repository" \
11049 dotest cvsadm-cleanup-1 "${testcvs} -q co CVSROOT/config" \
11053 dotest cvsadm-cleanup-2 "${testcvs} -q ci -m cvsadm-cleanup" \
11081 dotest emptydir-1 "${testcvs} co CVSROOT/modules" \
11089 dotest emptydir-2 "${testcvs} ci -m add-modules" \
11101 dotest emptydir-3 "${testcvs} -q co -l ." ""
11102 dotest emptydir-3a "${testcvs} co mod1 moda" \
11107 dotest emptydir-3b "${testcvs} add moda/modasub" \
11110 dotest emptydir-4 "${testcvs} add mod1/file1 moda/modasub/filea" \
11114 dotest emptydir-5 "${testcvs} -q ci -m yup" \
11130 dotest emptydir-6 "${testcvs} co 2d1mod" \
11150 dotest emptydir-9 "${testcvs} -q co -l CVSROOT" \
11155 dotest emptydir-11 "${testcvs} -q -n update -d -P" ''
11162 dotest emptydir-12 "${testcvs} -q co 2d1moda" \
11168 dotest emptydir-13 "cat dir2d1/CVS/Repository" "moda"
11173 dotest emptydir-15 "cat dir2d1/CVS/Repository" "moda"
11193 dotest abspath-1a "${testcvs} co mod1 mod2" \
11201 dotest abspath-1ba "${testcvs} add file1" \
11206 dotest abspath-1bb "${testcvs} add file2" \
11211 dotest abspath-1c "${testcvs} ci -m yup mod1 mod2" \
11234 dotest abspath-2a-try2 "${testcvs} co -d 1 mod1" \
11238 dotest abspath-2a "${testcvs} co -d ${TESTDIR}/1 mod1" \
11244 echo "${CVSROOT_DIRNAME}/mod1" > ${TESTDIR}/dotest.abs
11245 echo "mod1" > ${TESTDIR}/dotest.rel
11246 if cmp ${TESTDIR}/dotest.abs ${TESTDIR}/1/CVS/Repository >/dev/null 2>&1; then
11248 elif cmp ${TESTDIR}/dotest.rel ${TESTDIR}/1/CVS/Repository >/dev/null 2>&1; then
11253 rm -f ${TESTDIR}/dotest.rel ${TESTDIR}/dotest.abs
11255 dotest abspath-2b "cat ${TESTDIR}/1/CVS/Repository" \
11288 dotest abspath-3a-try2 "${testcvs} co -d 2 mod1" \
11294 dotest abspath-3a "${testcvs} co -d ${TESTDIR}/1/2 mod1" \
11298 dotest abspath-3b "cat ${TESTDIR}/1/2/CVS/Repository" \
11327 dotest abspath-5ar "${testcvs} co -d 1 mod1 mod2" \
11333 dotest abspath-5a "${testcvs} co -d ${TESTDIR}/1 mod1 mod2" \
11339 dotest abspath-5b "cat ${TESTDIR}/1/CVS/Repository" \
11341 dotest abspath-5c "cat ${TESTDIR}/1/mod1/CVS/Repository" \
11343 dotest abspath-5d "cat ${TESTDIR}/1/mod2/CVS/Repository" \
11351 dotest abspath-6ar "${testcvs} co -d 1 ." \
11360 dotest abspath-6a "${testcvs} co -d ${TESTDIR}/1 ." \
11369 dotest abspath-6b "cat ${TESTDIR}/1/CVS/Repository" \
11371 dotest abspath-6c "cat ${TESTDIR}/1/CVSROOT/CVS/Repository" \
11373 dotest abspath-6c "cat ${TESTDIR}/1/mod1/CVS/Repository" \
11375 dotest abspath-6d "cat ${TESTDIR}/1/mod2/CVS/Repository" \
11389 dotest abspath-7a-try2r "${testcvs} -q co -d 2 mod2" \
11393 dotest abspath-7a "${testcvs} -q co -d ${TESTDIR}/2 mod2" \
11396 dotest abspath-7b "ls" ""
11397 dotest abspath-7c "${testcvs} -q co mod1" \
11402 dotest abspath-7dr "${testcvs} -q co -d 3 mod2" \
11406 dotest abspath-7d "${testcvs} -q co -d ${TESTDIR}/3 mod2" \
11409 dotest abspath-7e "${testcvs} -q update -d" ""
11435 dotest toplevel-1a "${testcvs} -q co CVSROOT/config" \
11439 dotest toplevel-1b "${testcvs} -q ci -m yes-top-level" \
11449 dotest toplevel-1 "${testcvs} -q co -l ." ''
11451 dotest toplevel-2 "${testcvs} add top-dir second-dir" \
11457 dotest toplevel-3 "${testcvs} add file1" \
11460 dotest toplevel-4 "${testcvs} -q ci -m add" \
11471 dotest toplevel-3s "${testcvs} add file2" \
11474 dotest toplevel-4s "${testcvs} -q ci -m add" \
11484 dotest toplevel-5 "${testcvs} co top-dir" \
11488 dotest toplevel-6 "${testcvs} update top-dir" \
11490 dotest toplevel-7 "${testcvs} update" \
11494 dotest toplevel-8 "${testcvs} update -d top-dir" \
11507 dotest toplevel-9 "${testcvs} update -d" \
11515 dotest toplevel-10 "${testcvs} co top-dir" \
11521 dotest toplevel-11 "${testcvs} -q update -d second-dir" \
11533 dotest toplevel-12 "${testcvs} co top-dir" \
11544 dotest toplevel-cleanup-1 "${testcvs} -q co CVSROOT/config" \
11548 dotest toplevel-cleanup-2 "${testcvs} -q ci -m toplevel-cleanup" \
11565 dotest toplevel2-1a "${testcvs} -q co CVSROOT/config" \
11569 dotest toplevel2-1b "${testcvs} -q ci -m no-top-level" \
11580 dotest toplevel2-1 "${testcvs} -q co -l ." ''
11582 dotest toplevel2-2 "${testcvs} add top-dir second-dir" \
11588 dotest toplevel2-3 "${testcvs} add file1" \
11591 dotest toplevel2-4 "${testcvs} -q ci -m add" \
11602 dotest toplevel2-3s "${testcvs} add file2" \
11605 dotest toplevel2-4s "${testcvs} -q ci -m add" \
11615 dotest toplevel2-5 "${testcvs} co top-dir" \
11619 dotest toplevel2-6 "${testcvs} update top-dir" \
11621 dotest toplevel2-7 "${testcvs} update" \
11624 dotest toplevel2-8 "${testcvs} update -d top-dir" \
11627 dotest toplevel2-9 "${testcvs} update -d" \
11632 dotest toplevel2-10 "${testcvs} co top-dir" \
11638 dotest toplevel2-11 "${testcvs} -q update -d" ""
11640 dotest toplevel2-cleanup-1 "${testcvs} -q co CVSROOT/config" \
11644 dotest toplevel2-cleanup-2 "${testcvs} -q ci -m toplevel2-cleanup" \
11727 dotest editor-1 "${testcvs} -q co -l ." ''
11729 dotest editor-2 "${testcvs} add first-dir" \
11733 dotest editor-3 "${testcvs} add file1 file2" \
11737 dotest editor-4 "${testcvs} -e ${TESTDIR}/editme -q ci" \
11750 dotest editor-5 "${testcvs} -q tag -b br" "T file1
11752 dotest editor-6 "${testcvs} -q update -r br" ''
11754 dotest editor-7 "${testcvs} -e ${TESTDIR}/editme -q ci" \
11764 dotest editor-8 "${testcvs} -q update -A" "U file1"
11766 dotest editor-9 "${testcvs} -q -e ${TESTDIR}/editme ci -rbr file2" \
11772 dotest editor-log-file1 "${testcvs} log -N file1" "
11810 dotest editor-log-file2 "${testcvs} log -N file2" "
11927 dotest 168 "${testcvs} -q update" \
11950 dotest errmsg2-1 "${testcvs} -q co -l ." ''
11952 dotest errmsg2-2 "${testcvs} add first-dir" \
11977 dotest errmsg2-7 "${testcvs} -q ci -m add-file1" \
11986 dotest errmsg2-8 "${testcvs} add first-dir/sdir" \
11995 dotest errmsg2-8c "${testcvs} -q ci first-dir" ""
12001 dotest errmsg2-10 "${testcvs} add file10 sdir10" \
12005 dotest errmsg2-11 "${testcvs} -q ci -m add-file10" \
12014 dotest errmsg2-12 "${testcvs} -q update" ""
12020 dotest errmsg2-13 "${testcvs} add first-dir/sdir10/ssdir" \
12024 dotest errmsg2-14 \
12029 dotest errmsg2-15 "${testcvs} add first-dir/file15" \
12051 dotest errmsg2-17 "${testcvs} -q ci -m checkin" \
12064 dotest errmsg2-18 "${testcvs} -Q tag test" ''
12087 dotest adderrmsg-init1 "${testcvs} -q co -l ." ''
12089 dotest adderrmsg-init2 "${testcvs} add adderrmsg-dir" \
12101 dotest adderrmsg-3 "${testcvs} add file1" \
12110 dotest adderrmsg-6 "${testcvs} -q ci -madd" \
12192 dotest devcom-178 "${testcvs} editors" ""
12205 dotest devcom-180 "${testcvs} editors" \
12215 dotest 182.5 "${testcvs} unedit abb" ''
12217 dotest devcom-183 "${testcvs} editors" ""
12265 dotest devcom-a0 "${testcvs} watchers" ''
12269 dotest devcom-a-nonexist "${testcvs} watchers nonexist" ''
12271 dotest devcom-a1 "${testcvs} watch add" ''
12272 dotest devcom-a2 "${testcvs} watchers" \
12275 dotest devcom-a3 "${testcvs} watch remove -a unedit abb" ''
12276 dotest devcom-a4 "${testcvs} watchers abb" \
12281 dotest devcom-t0 "${testcvs} -q tag tag" \
12292 : dotest devcom-t-nonexist "${testcvs} watchers nonexist" fixme
12294 dotest devcom-t1 "${testcvs} -q co -rtag first-dir/abb" \
12303 dotest devcom-t2 "${testcvs} -q co -rtag first-dir" \
12316 dotest devcom-t3 "${testcvs} -q co -rtag first-dir" \
12325 dotest devcom-b0 "${testcvs} watch off" ''
12326 dotest devcom-b1 "${testcvs} watch remove" ''
12331 dotest devcom-some0 "${testcvs} watch on abc" ''
12335 dotest devcom-some1 "${testcvs} -q co first-dir" 'U first-dir/abb
12337 dotest devcom-some2 "test -w first-dir/abb" ''
12357 dotest devcom2-1 "${testcvs} -q co first-dir" ''
12363 dotest devcom2-2 "${testcvs} watch on w1" ''
12366 dotest devcom2-3 "${testcvs} add w1 w2 w3 nw1" "${DOTSTAR}"
12371 dotest devcom2-4 "${testcvs} watch on w2" ''
12372 dotest devcom2-5 "${testcvs} -q ci -m add-them" "${DOTSTAR}"
12377 dotest devcom2-6 "${testcvs} watch on w3" ''
12389 dotest devcom2-7 "${testcvs} -q co first-dir" 'U first-dir/nw1
12393 dotest devcom2-8 "test -w first-dir/nw1" ''
12400 dotest devcom2-12 "${testcvs} edit w4" \
12403 dotest devcom2-13 "${testcvs} watch on" ''
12404 dotest devcom2-14 "${testcvs} edit w5" \
12406 dotest devcom2-15 "${testcvs} editors" ''
12407 dotest devcom2-16 "${testcvs} editors w4" ''
12409 dotest devcom2-17 "cat ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr" \
12418 dotest devcom2-18 "${testcvs} -q co -d first+dir first-dir" \
12428 dotest devcom2-20 "cat ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr" \
12448 dotest devcom3-1 "${testcvs} -q co first-dir" ''
12452 dotest devcom3-2 "${testcvs} add w1 w2" "${DOTSTAR}"
12453 dotest devcom3-3 "${testcvs} watch on w1 w2" ''
12454 dotest devcom3-4 "${testcvs} -q ci -m add-them" "${DOTSTAR}"
12458 dotest devcom3-5 "cat ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr" \
12468 dotest devcom3-6 "${testcvs} watch off w1" ''
12472 dotest devcom3-7 "cat ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr" \
12485 dotest devcom3-8 "${testcvs} watch on w1" ''
12486 dotest devcom3-9 "cat ${CVSROOT_DIRNAME}/first-dir/CVS/fileattr" \
12505 dotest devcom3-9br "test -w w1" ""
12506 dotest devcom3-9cr "cat CVS/Notify" \
12509 dotest devcom3-9dr "${testcvs} -q update" ""
12511 dotest devcom3-9fr "${testcvs} watchers w1" \
12513 dotest devcom3-9gr "${testcvs} unedit w1" ""
12514 dotest devcom3-9hr "${testcvs} watchers w1" ""
12538 dotest watch4-0a "${testcvs} -q co -l ." ''
12540 dotest watch4-0b "${testcvs} add first-dir" \
12544 dotest watch4-1 "${testcvs} watch on" ''
12547 dotest watch4-2 "${testcvs} add file1" \
12550 dotest watch4-3 "${testcvs} -q ci -m add" \
12559 dotest watch4-4 "${testcvs} add subdir" \
12563 dotest watch4-5 "${testcvs} add sfile" \
12566 dotest watch4-6 "${testcvs} -q ci -m add" \
12575 dotest watch4-7 "${testcvs} -q co first-dir" "U first-dir/file1
12580 dotest watch4-10 "${testcvs} edit file1" ''
12585 dotest watch4-11 "${testcvs} edit file1" ''
12587 dotest watch4-12 "${testcvs} -q ci -m edit-in-1" \
12594 dotest watch4-13 "${testcvs} -q update" \
12612 dotest watch4-16 "cat file1" ''
12614 dotest watch4-17 "${testcvs} -q update" "U file1"
12615 dotest watch4-18 "cat file1" "edited in 1"
12619 dotest watch4-cleanup-1 "test -d 1" ''
12620 dotest watch4-cleanup-1 "test -d 2" ''
12644 dotest watch5-0a "${testcvs} -q co -l ." ''
12646 dotest watch5-0b "${testcvs} add first-dir" \
12650 dotest watch5-1 "${testcvs} watch on" ''
12653 dotest watch5-2 "${testcvs} add file1" \
12656 dotest watch5-3 "${testcvs} -q ci -m add" \
12663 dotest watch5-4 "${testcvs} edit file1" ''
12664 dotest watch5-5 "test -f CVS/Base/file1" ''
12670 dotest watch5-7 "test -f CVS/Base/file1" ''
12679 dotest watch5-10 "test -f CVS/Base/file1" ''
12683 dotest watch5-11 "${testcvs} -q up" ''
12684 dotest watch5-12 "test -f CVS/Base/file1" ''
12697 dotest unedit-without-baserev-1 \
12699 dotest unedit-without-baserev-2 "$testcvs -Q co $module" ''
12702 dotest unedit-without-baserev-3 "$testcvs -Q edit $file" ''
12708 echo "yes" | dotest unedit-without-baserev-4 "${testcvs} -Q unedit $file" \
12714 dotest unedit-without-baserev-5 "cat CVS/Entries" \
12718 dotest unedit-without-baserev-6r "${testcvs} -q update" "U m"
12720 dotest unedit-without-baserev-6 "${testcvs} -q update" \
12732 dotest unedit-without-baserev-7 "${testcvs} -Q co x" ''
12735 dotest unedit-without-baserev-10 "${testcvs} edit m" ''
12740 dotest unedit-without-baserev-11 "${testcvs} edit m" ''
12742 dotest unedit-without-baserev-12 "${testcvs} -q ci -m edit-in-1" \
12749 dotest unedit-without-baserev-13 "${testcvs} -q update" \
12758 echo yes | dotest unedit-without-baserev-14 "${testcvs} unedit m" \
12762 dotest unedit-without-baserev-15r "${testcvs} -q update" "U m"
12764 dotest unedit-without-baserev-15 "${testcvs} -q update" \
12771 dotest unedit-without-baserev-16 "cat m" 'edited in 1'
12773 dotest unedit-without-baserev-17 "${testcvs} -q update" ""
12774 dotest unedit-without-baserev-18 "cat m" "edited in 1"
12788 dotest ignore-1 "${testcvs} -q co CVSROOT" "U CVSROOT/${DOTSTAR}"
12791 dotest ignore-2 "${testcvs} add cvsignore" "${PROG}"' [a-z]*: scheduling file `cvsignore'"'"' for addition
12796 dotest ignore-3 " ${testcvs} ci -m added" \
12847 dotest ignore-7 "${testcvs} -q co -dsecond-dir ignore/second-dir" \
12854 dotest ignore-8 "${testcvs} -q co -dfirst-dir ignore/first-dir" 'U first-dir/bar.c
12858 dotest ignore-9 "${testcvs} -q update -I optig.c" "${QUESTION} notig.c"
12873 dotest ignore-11r "${testcvs} -q diff" "${QUESTION} notig.c"
12884 dotest ignore-11r "${testcvs} -q ci -m commit-it" "${QUESTION} notig.c"
12904 echo yes | dotest ignore-14 "${testcvs} release -d first-dir" \
12911 echo yes | dotest ignore-15 "${testcvs} release -d second-dir" \
12930 dotest ignore-on-branch-setup-1 "$testcvs -q co -dsetup ignore-on-branch" ''
12933 dotest ignore-on-branch-setup-2 "$testcvs -q add file1" \
12935 dotest ignore-on-branch-setup-3 "$testcvs -q ci -mfile1 file1" \
12942 dotest ignore-on-branch-setup-4 "$testcvs -q tag -b branch" 'T file1'
12944 dotest ignore-on-branch-setup-5 "$testcvs -q add file2" \
12946 dotest ignore-on-branch-setup-6 "$testcvs -q ci -mtrunk file2" \
12960 dotest ignore-on-branch-1 "$testcvs -q co -rbranch ignore-on-branch" \
12964 dotest ignore-on-branch-2 "$testcvs -nq update" '? file2'
12969 dotest ignore-on-branch-3 "$testcvs -q tag -b branch2" \
12973 dotest ignore-on-branch-3 "$testcvs -q tag -b branch2" 'T file1'
12975 dotest ignore-on-branch-4 "$testcvs -q add file2" \
12977 dotest ignore-on-branch-5 "$testcvs -q ci -mbranch file2" \
12982 dotest ignore-on-branch-6 "$testcvs -q up -rbranch2" \
12984 dotest ignore-on-branch-7 "$testcvs -q up -jbranch" 'U file2'
13004 dotest binfiles-1 "${testcvs} -q co first-dir" ''
13010 dotest binfiles-2 "${testcvs} add -kb binfile" \
13013 dotest binfiles-3 "${testcvs} -q ci -m add-it" \
13022 dotest binfiles-4 "${testcvs} -q co first-dir" 'U first-dir/binfile'
13024 dotest binfiles-5 "cmp ../../1/binfile.dat binfile" ''
13028 dotest binfiles-5.5 "${testcvs} status binfile" \
13043 dotest binfiles-5.5b0 "${testcvs} -q co first-dir/binfile" \
13046 dotest binfiles-5.5b1 "${testcvs} status binfile" \
13060 dotest binfiles-6 "${testcvs} -q ci -m modify-it" \
13066 dotest binfiles-7 "${testcvs} -q update" '[UP] binfile'
13067 dotest binfiles-8 "cmp ../binfile2.dat binfile" ''
13071 dotest binfiles-con0 "${testcvs} -q ci -m modify-it" \
13078 dotest binfiles-con1 "${testcvs} -q update" \
13084 dotest binfiles-con2 "cmp binfile ../../1/binfile.dat" ''
13085 dotest binfiles-con3 "cat .#binfile.1.2" 'edits in dir 2'
13088 dotest binfiles-con4 "${testcvs} -q ci -m resolve-it" \
13094 dotest binfiles-con5 "${testcvs} -q update" '[UP] binfile'
13096 dotest binfiles-9 "${testcvs} -q update -A" ''
13097 dotest binfiles-10 "${testcvs} -q update -kk" '[UP] binfile'
13098 dotest binfiles-11 "${testcvs} -q update" ''
13099 dotest binfiles-12 "${testcvs} -q update -A" '[UP] binfile'
13100 dotest binfiles-13 "${testcvs} -q update -A" ''
13106 dotest binfiles-13a0 "${testcvs} -q co -r HEAD first-dir" \
13109 dotest binfiles-13a1 "${testcvs} status binfile" \
13123 dotest binfiles-14a "${testcvs} -q ci -m modify-it" \
13128 dotest binfiles-14b "cat binfile" 'this file is $''RCSfile$'
13130 dotest binfiles-14c "${testcvs} status binfile" \
13139 dotest binfiles-14d "${testcvs} admin -kv binfile" \
13146 dotest binfiles-14e "cat binfile" 'this file is $''RCSfile$'
13147 dotest binfiles-14f "${testcvs} status binfile" \
13156 dotest binfiles-14g "${testcvs} -q update -A" '[UP] binfile'
13157 dotest binfiles-14h "cat binfile" 'this file is binfile,v'
13158 dotest binfiles-14i "${testcvs} status binfile" \
13170 dotest binfiles-sticky1 "${testcvs} -q add nibfile" \
13172 dotest binfiles-sticky2 "${testcvs} -q ci -m add-it nibfile" \
13179 dotest binfiles-sticky3 "${testcvs} -q update -kb nibfile" \
13181 dotest binfiles-sticky4 "${testcvs} -q status nibfile" \
13192 dotest binfiles-sticky5 "${testcvs} -q update -A nibfile" \
13194 dotest binfiles-sticky6 "${testcvs} -q status nibfile" \
13203 dotest binfiles-15 "${testcvs} -q admin -kb nibfile" \
13206 dotest binfiles-16 "${testcvs} -q update nibfile" "[UP] nibfile"
13207 dotest binfiles-17 "${testcvs} -q status nibfile" \
13217 dotest binfiles-o1 "${testcvs} admin -o1.3:: binfile" \
13222 dotest binfiles-o2 "${testcvs} admin -o::1.3 binfile" \
13227 dotest binfiles-o3 "${testcvs} -q log -h -N binfile" "
13240 dotest binfiles-o4 "${testcvs} -q update binfile" "U binfile"
13241 dotest binfiles-o5 "cmp binfile ../../1/binfile.dat" ""
13270 dotest binfiles2-1 "${testcvs} -q co first-dir" ''
13288 dotest binfiles2-1a \
13294 dotest binfiles2-1b "${testcvs} -q ci -m add" \
13313 dotest binfiles2-2 "${testcvs} -q tag -b br" 'T brmod
13316 dotest binfiles2-3 "${testcvs} -q update -r br" ''
13318 dotest binfiles2-4 "${testcvs} add -kb binfile.dat" \
13324 dotest binfiles2-5 "${testcvs} -q ci -m br-changes" \
13343 dotest binfiles2-6 "${testcvs} -q update -A" \
13349 dotest binfiles2-7-brmod "cmp ../binfile brmod"
13351 dotest binfiles2-7a "${testcvs} -q ci -m tr-modify" \
13358 dotest binfiles2-8 "${testcvs} -q update -j br" \
13371 dotest binfiles2-9 "cmp ../binfile binfile.dat"
13372 dotest binfiles2-9-brmod "cmp ../binfile2 brmod"
13373 dotest binfiles2-9-brmod-trmod "cmp ../binfile2 brmod-trmod"
13374 dotest binfiles2-9-brmod-trmod "cmp ../binfile2 brmod-wdmod"
13375 dotest binfiles2-9a-brmod-trmod "cmp ../binfile3 .#brmod-trmod.1.2"
13376 dotest binfiles2-9a-brmod-wdmod "cmp ../binfile3 .#brmod-wdmod.1.1"
13379 dotest binfiles2-10 "${testcvs} -q ci -m checkin" \
13402 dotest binfiles2-o2 "${testcvs} -q admin -o 1.1.2.1: brmod-trmod" \
13406 dotest binfiles2-o3 "${testcvs} -q admin -o :1.2 brmod-trmod" \
13411 dotest binfiles2-o4 "${testcvs} -q log -N brmod-trmod" "
13438 dotest binfiles3-1 "${testcvs} -q co first-dir" ''
13443 dotest binfiles3-2 "${testcvs} add file1" \
13446 dotest binfiles3-3 "${testcvs} -q ci -m add-it" \
13454 dotest binfiles3-4 "${testcvs} rm file1" \
13457 dotest binfiles3-5 "${testcvs} -q ci -m remove-it" \
13463 dotest binfiles3-6 "${testcvs} add -kb file1" \
13468 dotest binfiles3-6a "cat CVS/Entries" \
13475 dotest binfiles3-7 "${testcvs} -q ci -m readd-it" \
13481 dotest binfiles3-8 "${testcvs} -q log -h -N file1" "
13500 dotest binfiles3-9 "${testcvs} -q ci -m change" \
13506 dotest binfiles3-10 "${testcvs} -q ci -m change" \
13511 dotest binfiles3-11 "${testcvs} admin -o 1.3::1.5 file1" \
13515 dotest binfiles3-12 "${testcvs} -q update -r 1.3 file1" "U file1"
13516 dotest binfiles3-13 "cmp file1 ${TESTDIR}/1/binfile.dat" ""
13546 dotest mcopy-1 "${testcvs} -q co first-dir" ''
13556 dotest mcopy-1a \
13563 dotest mcopy-1b "${testcvs} -q ci -m add" \
13595 dotest mcopy-2 "${testcvs} -q tag -b br" 'T \.cvswrappers
13599 dotest mcopy-3 "${testcvs} -q update -r br" ''
13603 dotest mcopy-5 "${testcvs} -q ci -m br-changes" \
13616 dotest mcopy-6 "${testcvs} -q update -A" \
13620 dotest mcopy-7 "cat brmod brmod-trmod brmod-wdmod" \
13626 dotest mcopy-7a "${testcvs} -q ci -m tr-modify" \
13633 dotest mcopy-8 "${testcvs} -q update -j br" \
13645 dotest mcopy-9 "cat brmod brmod-trmod brmod-wdmod" \
13649 dotest mcopy-9a "cat .#brmod-trmod.1.2 .#brmod-wdmod.1.1" \
13654 dotest mcopy-10 "${testcvs} -q ci -m checkin" \
13699 dotest binwrap-2 "${testcvs} -q co first-dir" 'U first-dir/foo.c
13701 dotest binwrap-3 "${testcvs} -q status first-dir" \
13744 dotest binwrap2-2 "${testcvs} -q co first-dir" 'U first-dir/foo.c
13746 dotest binwrap2-3 "${testcvs} -q status first-dir" \
13866 dotest binwrap3-1 "${testcvs} -q co CVSROOT" "[UP] CVSROOT${DOTSTAR}"
13872 dotest binwrap3-2 "${testcvs} -q ci -m cvswrappers-mod" \
13889 dotest binwrap3-2a \
13896 dotest binwrap3-2b "${testcvs} co binwrap3" "${DOTSTAR}"
13903 dotest binwrap3-2c "${testcvs} add file1.newbin file1.txt" \
13907 dotest binwrap3-2d "${testcvs} -q ci -m add" \
13925 dotest binwrap3-3 "${testcvs} co binwrap3" "${DOTSTAR}"
13932 dotest binwrap3-top1 "grep foo-b.c0 ./CVS/Entries" \
13935 dotest binwrap3-top2 "grep foo-b.sb ./CVS/Entries" \
13938 dotest binwrap3-top3 "grep foo-t.c1 ./CVS/Entries" \
13941 dotest binwrap3-top4 "grep foo-t.st ./CVS/Entries" \
13944 dotest binwrap3-sub1-1 "grep foo-b.c1 sub1/CVS/Entries" \
13947 dotest binwrap3-sub1-2 "grep foo-b.sb sub1/CVS/Entries" \
13950 dotest binwrap3-sub1-3 "grep foo-t.c0 sub1/CVS/Entries" \
13953 dotest binwrap3-sub1-4 "grep foo-t.st sub1/CVS/Entries" \
13956 dotest binwrap3-sub2-1 "grep foo-b.sb sub2/CVS/Entries" \
13959 dotest binwrap3-sub2-2 "grep foo-b.st sub2/CVS/Entries" \
13962 dotest binwrap3-sub2-3 "grep foo-t.c0 sub2/CVS/Entries" \
13965 dotest binwrap3-sub2-4 "grep foo-t.c1 sub2/CVS/Entries" \
13968 dotest binwrap3-sub2-5 "grep foo-t.c2 sub2/CVS/Entries" \
13971 dotest binwrap3-sub2-6 "grep foo-t.c3 sub2/CVS/Entries" \
13974 dotest binwrap3-subsub1 "grep foo-b.c3 sub2/subsub/CVS/Entries" \
13977 dotest binwrap3-subsub2 "grep foo-b.sb sub2/subsub/CVS/Entries" \
13980 dotest binwrap3-subsub3 "grep foo-t.c0 sub2/subsub/CVS/Entries" \
13983 dotest binwrap3-subsub4 "grep foo-t.c1 sub2/subsub/CVS/Entries" \
13986 dotest binwrap3-subsub5 "grep foo-t.c2 sub2/subsub/CVS/Entries" \
13989 dotest binwrap3-subsub6 "grep foo-t.st sub2/subsub/CVS/Entries" \
13992 dotest binwrap3-sub2-add1 "grep file1.newbin sub2/CVS/Entries" \
13994 dotest binwrap3-sub2-add2 "grep file1.txt sub2/CVS/Entries" \
14028 dotest mwrap-c1 "${testcvs} -q co CVSROOT" "[UP] CVSROOT${DOTSTAR}"
14031 dotest mwrap-c2 "${testcvs} -q ci -m wrapper-mod" \
14039 dotest mwrap-1 "${testcvs} -q co -l ." ''
14041 dotest mwrap-2 "${testcvs} add first-dir" \
14045 dotest mwrap-3 "${testcvs} add aa" \
14048 dotest mwrap-4 "${testcvs} -q ci -m add" \
14057 dotest mwrap-5 "${testcvs} -q co first-dir" "U first-dir/aa"
14060 dotest mwrap-6 "${testcvs} -q ci -m m2-mod" \
14072 dotest mwrap-7 "${testcvs} -nq update" \
14079 dotest mwrap-7 "${testcvs} -nq update" \
14086 dotest mwrap-8 "${testcvs} -q update" \
14092 dotest mwrap-9 "cat aa" "changed in m2"
14093 dotest mwrap-10 "cat .#aa.1.1" "changed in m1"
14097 dotest mwrap-ce "${testcvs} -q ci -m wrapper-mod" \
14127 dotest info-1 "${testcvs} -q co CVSROOT" "[UP] CVSROOT${DOTSTAR}"
14142 : dotest info-2 "${testcvs} add loginfo" \
14146 dotest info-3 "${testcvs} -q ci -m new-loginfo" \
14155 dotest info-5 "${testcvs} -q co first-dir" ''
14158 dotest info-6 "${testcvs} add file1" \
14162 dotest info-6a "${testcvs} -q -s OTHER=value ci -m add-it" \
14171 dotest info-6b "${testcvs} -q -sOTHER=foo ci -m mod-it" \
14178 dotest info-7 "${testcvs} -q -s OTHER=value -s ZEE=z ci -m mod-it" \
14184 dotest info-9 "cat $TESTDIR/testlog" "xenv-valueyz=${username}=${CVSROOT_DIRNAME}="
14185 dotest info-10 "cat $TESTDIR/testlog2" 'first-dir file1,NONE,1.1
14203 dotest info-11 "${testcvs} -q -s ZEE=garbage ci -m nuke-loginfo" \
14223 dotest info-v1 "${testcvs} -q ci -m add-verification" \
14240 dotest info-v3 "${testcvs} -q ci -F ${TESTDIR}/comment.tmp" \
14259 dotest info-cleanup-verifymsg "${testcvs} -q ci -m nuke-verifymsg" \
14294 dotest taginfo-1 "${testcvs} -q co CVSROOT" "U CVSROOT/${DOTSTAR}"
14307 dotest taginfo-2 "${testcvs} -q ci -m check-in-taginfo" \
14320 dotest taginfo-3 "${testcvs} -q co first-dir" ''
14324 dotest taginfo-4 "${testcvs} add file1" \
14327 dotest taginfo-5 "${testcvs} -q ci -m add-it" \
14334 dotest taginfo-6 "${testcvs} -q tag tag1" "T file1"
14335 dotest taginfo-7 "${testcvs} -q tag -b br" "T file1"
14336 dotest taginfo-8 "${testcvs} -q update -r br" ""
14338 dotest taginfo-9 "${testcvs} -q ci -m modify-on-br" \
14343 dotest taginfo-10 "${testcvs} -q tag -F -c brtag" "T file1"
14352 dotest taginfo-12 "${testcvs} -nq tag rejectme" "T file1"
14357 dotest taginfo-13 "${testcvs} -nq tag would-be-tag" "T file1"
14361 dotest taginfo-14 "${testcvs} -q tag -d tag1" "D file1"
14362 dotest taginfo-15 "${testcvs} -q tag -d tag1" ""
14365 dotest taginfo-16 "${testcvs} -q rtag tag1 first-dir" ""
14366 dotest taginfo-17 "${testcvs} -q rtag -d tag1 first-dir" ""
14367 dotest taginfo-18 "${testcvs} -q rtag -d tag1 first-dir" ""
14380 dotest taginfo-examine "cat ${TESTDIR}/1/taglog" \
14393 dotest taginfo-cleanup-1 "${testcvs} -q ci -m check-in-taginfo" \
14414 dotest config-1 "${testcvs} -q co CVSROOT" "U CVSROOT/${DOTSTAR}"
14419 dotest config-3 "${testcvs} -q ci -m change-to-bogus-line" \
14426 dotest config-4 "${testcvs} -q ci -m change-to-bogus-opt" \
14434 dotest config-5 "${testcvs} -q ci -m change-to-comment" \
14441 dotest config-6 "${testcvs} -q update" ''
14457 dotest serverpatch-1 "${testcvs} -q co first-dir" ''
14464 dotest serverpatch-2 "${testcvs} add file1" \
14468 dotest serverpatch-3 "${testcvs} -q commit -m add" \
14477 dotest serverpatch-4 "${testcvs} -q tag tag file1" 'T file1'
14483 dotest serverpatch-5 "${testcvs} -q co -r tag first-dir" \
14488 dotest serverpatch-6 "${testcvs} -q update -A first-dir" ''
14493 dotest serverpatch-7 "${testcvs} -q ci -mx file1" \
14502 dotest serverpatch-8 "${testcvs} -q update" \
14531 dotest log-1 "${testcvs} -q co first-dir" ''
14534 dotest log-2 "${testcvs} add file1" \
14545 dotest log-3 "${testcvs} -q commit -F ${TESTDIR}/comment.tmp" \
14555 dotest log-4 "${testcvs} -q ci -m2 file1" \
14561 dotest log-5 "${testcvs} -q tag -b branch file1" 'T file1'
14564 dotest log-6 "${testcvs} -q ci -m3 file1" \
14570 dotest log-7 "${testcvs} -q update -r branch" '[UP] file1'
14573 dotest log-8 "${testcvs} -q ci -m1b file1" \
14579 dotest log-9 "${testcvs} -q tag tag file1" 'T file1'
14582 dotest log-10 "${testcvs} -q ci -m2b file1" \
14633 dotest log-11 "${testcvs} log file1" \
14646 dotest log-12 "${testcvs} log -N file1" \
14658 dotest log-13 "${testcvs} log -b file1" \
14669 dotest log-14 "${testcvs} log -r file1" \
14678 dotest log-14a "${testcvs} log -rHEAD file1" \
14702 dotest log-14c "${testcvs} log -r: file1" \
14710 dotest log-14d "${testcvs} log -r, file1" \
14718 dotest log-14e "${testcvs} log -r. file1" \
14726 dotest log-14f "${testcvs} log -r:: file1" \
14734 dotest log-15 "${testcvs} log -r1.2 file1" \
14743 dotest log-16 "${testcvs} log -r1.2.2 file1" \
14755 dotest log-17 "${testcvs} log -rbranch file1" \
14765 dotest log-18 "${testcvs} log -r1.2.2. file1" \
14776 dotest log-18a "${testcvs} log -r1.2.2.2 -r1.3:1.3 file1" \
14788 dotest log-19 "${testcvs} log -rbranch. file1" \
14797 dotest log-20 "${testcvs} log -r1.2: file1" \
14807 dotest log-20a "${testcvs} log -r1.2:: file1" \
14816 dotest log-21 "${testcvs} log -r:1.2 file1" \
14826 dotest log-21a "${testcvs} log -r::1.2 file1" \
14835 dotest log-22 "${testcvs} log -r1.1:1.2 file1" \
14845 dotest log-22a "${testcvs} log -r1.1::1.2 file1" \
14853 dotest log-22b "${testcvs} log -r1.1::1.3 file1" \
14864 dotest log-r11 "${testcvs} rlog first-dir/file1" \
14877 dotest log-r12 "${testcvs} rlog -N first-dir/file1" \
14889 dotest log-r13 "${testcvs} rlog -b first-dir/file1" \
14900 dotest log-r14 "${testcvs} rlog -r first-dir/file1" \
14909 dotest log-r14a "${testcvs} rlog -rHEAD first-dir/file1" \
14928 dotest log-r14c "${testcvs} rlog -r: first-dir/file1" \
14936 dotest log-r14d "${testcvs} rlog -r, first-dir/file1" \
14944 dotest log-r14e "${testcvs} rlog -r. first-dir/file1" \
14952 dotest log-r14f "${testcvs} rlog -r:: first-dir/file1" \
14960 dotest log-r15 "${testcvs} rlog -r1.2 first-dir/file1" \
14969 dotest log-r16 "${testcvs} rlog -r1.2.2 first-dir/file1" \
14979 dotest log-r17 "${testcvs} rlog -rbranch first-dir/file1" \
14989 dotest log-r18 "${testcvs} rlog -r1.2.2. first-dir/file1" \
14998 dotest log-r18a "${testcvs} rlog -r1.2.2.2 -r1.3:1.3 first-dir/file1" \
15008 dotest log-r19 "${testcvs} rlog -rbranch. first-dir/file1" \
15017 dotest log-r20 "${testcvs} rlog -r1.2: first-dir/file1" \
15027 dotest log-r20a "${testcvs} rlog -r1.2:: first-dir/file1" \
15036 dotest log-r21 "${testcvs} rlog -r:1.2 first-dir/file1" \
15046 dotest log-r21a "${testcvs} rlog -r::1.2 first-dir/file1" \
15055 dotest log-r22 "${testcvs} rlog -r1.1:1.2 first-dir/file1" \
15065 dotest log-r22a "${testcvs} rlog -r1.1::1.2 first-dir/file1" \
15073 dotest log-r22b "${testcvs} rlog -r1.1::1.3 first-dir/file1" \
15084 dotest log-o0 "${testcvs} admin -o 1.2.2.2:: file1" \
15087 dotest log-o1 "${testcvs} admin -o ::1.2.2.1 file1" \
15090 dotest log-o2 "${testcvs} admin -o 1.2.2.1:: file1" \
15094 dotest log-o3 "${testcvs} log file1" \
15105 dotest log-ro3 "${testcvs} rlog first-dir/file1" \
15116 dotest log-o4 "${testcvs} -q update -p -r 1.2.2.1 file1" \
15128 dotest log2-1 "${testcvs} -q co first-dir" ''
15131 dotest log2-2 "${testcvs} add -m file1-is-for-testing file1" \
15134 dotest log2-3 "${testcvs} -q commit -m 1" \
15145 dotest log2-4 "${testcvs} log -N file1" "
15164 dotest log2-5 "${testcvs} admin -t-change-description file1" \
15167 dotest log2-6 "${testcvs} log -N file1" "
15186 dotest log2-7 "${testcvs} admin -t${TESTDIR}/descrip file1" \
15191 dotest log2-8 "${testcvs} log -N file1" "
15214 dotest log2-9 "echo change from stdin | ${testcvs} admin -t -q file1" ""
15215 dotest log2-10 "${testcvs} log -N file1" "
15242 dotest logopt-1 "${testcvs} -q co -l ." ''
15244 dotest logopt-2 "${testcvs} add first-dir" \
15248 dotest logopt-3 "${testcvs} add file1" \
15251 dotest logopt-4 "${testcvs} -q ci -m add file1" \
15260 dotest logopt-5 "${testcvs} log -R -d 2038-01-01" \
15264 dotest logopt-6 "${testcvs} log -d 2038-01-01 -R" \
15268 dotest logopt-6a "${testcvs} log -Rd 2038-01-01" \
15272 dotest logopt-7 "${testcvs} log -s Exp -R" \
15288 dotest ann-1 "${testcvs} -q co -l ." ''
15290 dotest ann-2 "${testcvs} add first-dir" \
15300 dotest ann-3 "${testcvs} add file1" \
15303 dotest ann-4 "${testcvs} -q ci -m add file1" \
15321 dotest ann-5 "${testcvs} -q ci -m modify file1" \
15326 dotest ann-6 "${testcvs} -q tag -b br" "T file1"
15338 dotest ann-7 "${testcvs} -q ci -m modify file1" \
15343 dotest ann-8 "${testcvs} -q update -r br" "[UP] file1"
15357 dotest ann-9 "${testcvs} -q ci -m modify" \
15366 dotest ann-10 "${testcvs} ann" \
15378 dotest ann-11 "${testcvs} ann -r br" \
15393 dotest ann-12 "${testcvs} ann -r 1.2.0.2 file1" ""
15394 dotest ann-13 "${testcvs} ann -r 1.2.2 file1" \
15415 dotest ann-r10 "${testcvs} rann first-dir" \
15427 dotest ann-r11 "${testcvs} rann -r br first-dir" \
15441 dotest ann-r12 "${testcvs} rann -r 1.2.0.2 first-dir/file1" ""
15442 dotest ann-r13 "${testcvs} rann -r 1.2.2 first-dir/file1" \
15468 dotest ann-id-1 "${testcvs} -q co -l ." ''
15471 dotest ann-id-2 "${testcvs} add $module" \
15478 dotest ann-id-3 "$testcvs add $file" \
15481 dotest ann-id-4 "$testcvs -Q ci -m . $file" \
15490 dotest ann-id-5 "$testcvs -Q ci -m . $file" \
15498 dotest ann-id-6 "$testcvs -Q ann $file" \
15570 dotest crerepos-4 \
15582 dotest crerepos-6 "rmdir tmp" ''
15640 dotest crerepos-8 "${testcvs} -q co -l ." ''
15642 dotest crerepos-9 "${testcvs} add first-dir" \
15646 dotest crerepos-10 "${testcvs} add file1" \
15649 dotest crerepos-11 "${testcvs} -q ci -m add-it" \
15660 dotest crerepos-12 "${testcvs} -d ${CREREPOS_ROOT} -q co -l ." ''
15662 dotest crerepos-13 "${testcvs} add crerepos-dir" \
15666 dotest crerepos-14 "${testcvs} add cfile" \
15669 dotest crerepos-15 "${testcvs} -q ci -m add-it" \
15680 dotest crerepos-16 "${testcvs} co first-dir" \
15683 dotest crerepos-17 "${testcvs} -d ${CREREPOS_ROOT} co crerepos-dir" \
15686 dotest crerepos-18 "${testcvs} update" \
15798 dotest rcs-1 "${testcvs} -q co first-dir" 'U first-dir/file1'
15800 dotest rcs-2 "${testcvs} -q log" "
15834 dotest rcs-3 "${testcvs} -q log -d '1996-12-11<'" "
15853 dotest rcs-4 "${testcvs} -q log -d '<3 Apr 2000 00:00'" \
15879 dotest rcs-4a "${testcvs} annotate file1" \
15938 dotest rcs-5 "${testcvs} -q update file2" "U file2"
15939 dotest rcs-6 "cat file2" "branch revision"
15943 dotest rcs-6a "${testcvs} -q update -r branch file2" ""
15945 dotest rcs-6b "${testcvs} -q ci -m mod file2" \
15952 dotest rcs-7 "${testcvs} admin -b file2" \
15959 dotest rcs-8 \
15964 dotest rcs-8a "cat ${CVSROOT_DIRNAME}/first-dir/file2,v" \
16079 dotest rcs-9 "${testcvs} -q update -p -D '1970-12-31 11:30 UT' file2" \
16082 dotest rcs-10 "${testcvs} -q update -p -D '1970-12-31 12:30 UT' file2" \
16085 dotest rcs-11 "${testcvs} -q update -p -D '1971-01-01 00:30 UT' file2" \
16089 dotest rcs-12 "${testcvs} -q update -p -D 'December 31, 1970 12:30pm UT' file2" \
16093 dotest rcs-13 "${testcvs} -q update -p -D 'January 1, 1971 12:30am UT' file2" \
16098 dotest rcs-14 "${testcvs} -q log file2" "
16142 dotest rcs-15 "${testcvs} -q log -d '<1971-01-01 00:00 GMT' file2 \
16149 dotest rcs-16 "${testcvs} -q log -d '1971-01-01 00:00 GMT<' file2 \
16157 dotest rcs-17 "${testcvs} -q log -d '>1971-01-01 00:00 GMT' \
16166 dotest rcs-18 "${testcvs} -q log -d '1970-12-31 11:30 GMT' \
16173 dotest rcs-19 "${testcvs} -q log \
16229 dotest rcs2-1 "${testcvs} -q co first-dir" 'U first-dir/file1'
16233 dotest rcs2-2 "${testcvs} -q update -p -D '1999-09-09 11:30 UT' file1" \
16236 dotest rcs2-3 "${testcvs} -q update -p -D '2001-01-01 11:30 UT' file1" \
16239 dotest rcs2-4 "${testcvs} -q update -p -D '2000-02-29 11:30 UT' file1" \
16245 dotest rcs2-6 "${testcvs} -q update -p -D 2007-01-07 file1" \
16261 dotest rcs2-7 "${testcvs} -q update -p -D '100 months' file1" \
16263 dotest rcs2-8 "${testcvs} -q update -p -D '8 years' file1" \
16305 dotest rcs3-4 "${testcvs} -q co first-dir" 'U first-dir/file1'
16318 dotest rcs3-6 "${testcvs} log -R file1" \
16342 dotest lockfiles-1 \
16347 dotest lockfiles-2 "${testcvs} -q co first-dir" \
16349 dotest lockfiles-3 "${testcvs} -Q co CVSROOT" ""
16352 dotest lockfiles-4 "${testcvs} -q ci -m config-it" \
16368 dotest lockfiles-6 "${testcvs} -q update" ""
16372 dotest lockfiles-7 "ls ${TESTDIR}/locks/first-dir/sdir/ssdir" ""
16378 dotest lockfiles-7a "ls -ld ${TESTDIR}/locks/first-dir" \
16380 dotest lockfiles-7b "ls -ld ${TESTDIR}/locks/first-dir/sdir/ssdir" \
16384 dotest lockfiles-8 "${testcvs} -q update" ""
16385 dotest lockfiles-9 "${testcvs} -q co -l ." ""
16389 dotest lockfiles-cleanup-1 "${testcvs} -q ci -m config-it" \
16428 dotest backuprecover-1 "${testcvs} -q co -l ." ''
16430 dotest backuprecover-2 "${testcvs} add first-dir" \
16434 dotest backuprecover-3 "${testcvs} add dir" \
16437 dotest backuprecover-4 "${testcvs} -q add file1 dir/file2" \
16439 dotest backuprecover-5 "${testcvs} -q ci -mtest" \
16464 dotest backuprecover-6 "${testcvs} -q ci -mtest" \
16478 dotest backuprecover-7 "${testcvs} -Q co first-dir" ''
16491 dotest backuprecover-8 "${testcvs} -q ci -mtest" \
16507 dotest backuprecover-9a "${testcvs} -Q co first-dir" ''
16515 dotest backuprecover-9b "${testcvs} -q ci -mtest" \
16528 dotest backuprecover-10 "${testcvs} -Q co first-dir" ''
16534 dotest backuprecover-11 "${testcvs} -Q update" ''
16545 dotest backuprecover-12 "${testcvs} -q ci -mtest" \
16557 dotest backuprecover-13 "${testcvs} -Q update" ''
16559 dotest backuprecover-14 "${testcvs} -q ci -mtest" \
16579 dotest backuprecover-15 "${testcvs} update" \
16614 dotest backuprecover-17 \
16617 dotest backuprecover-18 \
16624 dotest backuprecover-19 "${testcvs} -q ci -mrecover/merge" \
16636 dotest backuprecover-20 "${testcvs} update" \
16660 dotest backuprecover-21 "${testcvs} -q ci -mrecover/merge" \
16668 dotest backuprecover-22 "${testcvs} -Q update" \
16677 dotest backuprecover-23 "${testcvs} -q ci -mtest" \
16689 dotest backuprecover-24 "${testcvs} -Q update" ''
16717 dotest history-1 "${testcvs} history -e -a" \
16728 dotest history-2 "${testcvs} history -e -a -D '10 Jun 1997 13:00 UT'" \
16734 dotest history-3 "${testcvs} history -e -a -D '10 Jun 2001 13:00 UT'" \
16737 dotest history-4 "${testcvs} history -ac sanity.sh" \
16741 dotest history-5 "${testcvs} history -a -xCGUWAMR README sanity.sh" \
16746 dotest history-6 "${testcvs} history -xCGUWAMR -a -f README -f sanity.sh" \
16751 dotest history-7 "${testcvs} history -xCGUWAMR -a -f sanity.sh README" \
16756 dotest history-8 "${testcvs} history -ca -D '1970-01-01 00:00 UT'" \
16762 dotest history-9 "${testcvs} history -acl" \
16767 dotest history-10 "${testcvs} history -lca -D '1970-01-01 00:00 UT'" \
16772 dotest history-11 "${testcvs} history -aw" \
16777 dotest history-12 "${testcvs} history -aw -D'1970-01-01 00:00 UT'" \
16796 dotest big-1 "${testcvs} -q co first-dir" ''
16806 dotest big-2 "${testcvs} add file1" \
16809 dotest big-3 "${testcvs} -q ci -m add" \
16819 dotest big-4 "${testcvs} -q get first-dir" "U first-dir/file1"
16822 dotest big-5 "${testcvs} -q ci -m modify" \
16830 dotest big-6 "${testcvs} -q update" "[UP] file1"
16857 dotest modes-1 "${testcvs} -q co -l ." ''
16859 dotest modes-2 "${testcvs} add first-dir" \
16863 dotest modes-3 "${testcvs} add aa" \
16866 dotest modes-4 "${testcvs} -q ci -m add" \
16873 dotest modes-5 "ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v" \
16879 dotest modes-6 "${testcvs} -q ci -m set-execute-bit" \
16887 dotest modes-7 "ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v" \
16893 dotest modes-7a "${testcvs} -q ci -m set-execute-bit" \
16898 dotest modes-7b "ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v" \
16906 dotest modes-8 "${testcvs} add ab" \
16909 dotest modes-9 "${testcvs} -q ci -m add" \
16920 dotest modes-10r "ls -l ${CVSROOT_DIRNAME}/first-dir/ab,v" \
16923 dotest modes-10 "ls -l ${CVSROOT_DIRNAME}/first-dir/ab,v" \
16929 dotest modes-11 "${testcvs} -q tag -b br" 'T aa
16931 dotest modes-12 "${testcvs} -q update -r br" ''
16933 dotest modes-13 "${testcvs} add ac" \
16939 dotest modes-14 "${testcvs} -q ci -m add" \
16953 dotest modes-15r \
16957 dotest modes-15 \
16975 dotest modes2-1 "${testcvs} -q co -l ." ''
16977 dotest modes2-2 "${testcvs} add first-dir" \
16981 dotest modes2-3 "${testcvs} add aa" \
16984 dotest modes2-4 "${testcvs} -q ci -m add" \
16992 dotest modes2-5 "${testcvs} -q ci -m add" \
17022 dotest modes3-1 "${testcvs} -q co -l ." ''
17024 dotest modes3-2 "${testcvs} add first-dir second-dir" \
17028 dotest modes3-3 "${testcvs} add first-dir/aa second-dir/ab" \
17032 dotest modes3-4 "${testcvs} -q ci -m add" \
17046 dotest modes3-5 "${testcvs} update" \
17058 dotest modes3-6 "${testcvs} update -dP" \
17076 dotest stamps-1 "${testcvs} -q co -l ." ''
17078 dotest stamps-2 "${testcvs} add first-dir" \
17089 dotest stamps-3 "${testcvs} add aa kw" \
17096 dotest stamps-4aa \
17098 dotest stamps-4kw \
17101 dotest stamps-5 "${testcvs} -q ci -m add" \
17122 dotest stamps-6aa \
17134 dotest stamps-7 "${testcvs} -q get first-dir" "U first-dir/aa
17149 dotest stamps-8kw \
17156 dotest stamps-9 "${testcvs} -q ci -m change-them" \
17170 dotest stamps-10 "${testcvs} -q update" '[UP] aa
17220 dotest perms-1 "${testcvs} -q co -l ." ''
17222 dotest perms-2 "${testcvs} add first-dir" \
17228 dotest perms-3 "${testcvs} add foo" \
17231 dotest perms-4 "${testcvs} -q ci -m ''" \
17242 dotest perms-5 "${testcvs} -q co first-dir" "U first-dir/foo"
17246 dotest perms-6 "ls -l foo" "-r---wx--x .* foo"
17265 dotest symlinks-1 "${testcvs} -q co -l ." ''
17267 dotest symlinks-2 "${testcvs} add first-dir" \
17271 dotest symlinks-2.1 "ln -s ${TESTDIR}/fumble slink" ""
17272 dotest symlinks-3 "${testcvs} add slink" \
17281 dotest symlinks-4 "${testcvs} -q ci -m ''" \
17292 dotest symlinks-5 "${testcvs} -q co first-dir" "U first-dir/slink"
17294 dotest symlinks-6 "ls -l slink" \
17312 dotest symlinks2-1 "${testcvs} -q co -l ." ''
17314 dotest symlinks2-2 "${testcvs} add first-dir" \
17318 dotest symlinks2-3 "${testcvs} add slink" \
17321 dotest symlinks2-4 "${testcvs} -q ci -m ''" \
17331 dotest symlinks2-5 "ln -s cvslog.file2 slink" ""
17332 dotest symlinks2-6 "${testcvs} -q ci -m linkify" \
17337 dotest symlinks2-7 "${testcvs} -q update -r 1.1 slink" "[UP] slink"
17338 dotest symlinks2-8 "cat slink" "nonsymlink"
17339 dotest symlinks2-9 "ls -l slink" "-[-rwx]* .* slink"
17353 dotest hardlinks-1 "${testcvs} -q co -l ." ''
17355 dotest hardlinks-2 "${testcvs} add first-dir" \
17360 # encoded properly in the delta nodes. Note that `dotest' screws
17383 dotest hardlinks-3 "${testcvs} add [abd]*" \
17388 dotest hardlinks-4 "${testcvs} -q ci -m ''" \
17412 dotest hardlinks-5r "${testcvs} -q co first-dir" \
17417 dotest hardlinks-6r "ls -l [abd]*" \
17422 dotest hardlinks-5 "${testcvs} -q co first-dir" \
17433 dotest hardlinks-6 "ls -l [abd]*" \
17454 dotest sticky-1 "${testcvs} -q co -l ." ''
17456 dotest sticky-2 "${testcvs} add first-dir" \
17461 dotest sticky-3 "${testcvs} add file1" \
17464 dotest sticky-4 "${testcvs} -q ci -m add" \
17471 dotest sticky-5 "${testcvs} -q tag tag1" "T file1"
17473 dotest sticky-6 "${testcvs} -q ci -m modify" \
17478 dotest sticky-7 "${testcvs} -q update -r tag1" "[UP] file1"
17479 dotest sticky-8 "cat file1" ''
17480 dotest sticky-9 "${testcvs} -q update" ''
17481 dotest sticky-10 "cat file1" ''
17485 dotest sticky-12 "${testcvs} -q update -A" "[UP] file1
17488 dotest sticky-13 "${testcvs} add file2" \
17491 dotest sticky-14 "${testcvs} -q ci -m add" \
17500 dotest sticky-15 "${testcvs} -q update -r tag1" "[UP] file1
17504 dotest sticky-16 "${testcvs} rm file1" \
17510 dotest sticky-17 "${testcvs} -q ci -m remove-it" ""
17511 dotest sticky-18 "${testcvs} -q update -A" "U file1
17513 dotest sticky-19 "${testcvs} -q update -r tag1" \
17516 dotest sticky-20 "${testcvs} -q update -A" "U file1
17520 dotest sticky-21 "${testcvs} -q update -r 1.1 file1" "U file1"
17522 dotest sticky-22 "${testcvs} rm file1" \
17535 dotest sticky-23 "${testcvs} -q update -A" \
17558 dotest keyword-1 "${testcvs} -q co -l ." ''
17560 dotest keyword-2 "${testcvs} add first-dir" \
17582 dotest keyword-3 "${testcvs} add file1" \
17585 dotest keyword-4 "${testcvs} -q ci -m add" \
17592 dotest keyword-5 "cat file1" \
17614 dotest keyword-6 "${testcvs} admin -l file1" \
17619 dotest keyword-7 "${testcvs} update -kkv file1" "U file1"
17620 dotest keyword-8 "cat file1" \
17639 dotest keyword-9 "${testcvs} update -kkvl file1" "U file1"
17640 dotest keyword-10 "cat file1" \
17659 dotest keyword-11 "${testcvs} update -kk file1" "U file1"
17660 dotest keyword-12 "cat file1" \
17679 dotest keyword-13 "${testcvs} update -kv file1" "U file1"
17680 dotest keyword-14 "cat file1" \
17699 dotest keyword-15 "${testcvs} update -ko file1" "U file1"
17700 dotest keyword-16 "cat file1" \
17718 dotest keyword-17 "${testcvs} update -A file1" "U file1"
17721 dotest keyword-18 "${testcvs} ci -m modify file1" \
17726 dotest keyword-19 "${testcvs} -q tag tag1" "T file1"
17728 dotest keyword-20 "${testcvs} -q ci -m mod2 file1" \
17733 dotest keyword-21 "${testcvs} -q update -r tag1" "[UP] file1"
17735 dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$'
17740 dotest keyword-23r "${testcvs} update -A file1" "P file1
17745 dotest keyword-23 "${testcvs} update -A file1" "[UP] file1"
17747 dotest keyword-24 "cat file1" '\$'"Name: "'\$'"
17758 dotest keywordlog-1 "${testcvs} -q co -l ." ''
17760 dotest keywordlog-2 "${testcvs} add first-dir" \
17764 dotest keywordlog-3 "${testcvs} add file1" \
17769 dotest keywordlog-4 "${testcvs} -q ci -r 1.3 -m add file1" \
17779 dotest keywordlog-4a "${testcvs} -q co first-dir" "U first-dir/file1"
17792 dotest keywordlog-4c "${testcvs} -q update -A" "M file1"
17794 dotest keywordlog-5 "${testcvs} ci -F ${TESTDIR}/comment.tmp file1" \
17800 dotest keywordlog-6 "${testcvs} -q tag -b br" "T file1"
17801 dotest keywordlog-7 "cat file1" \
17810 dotest keywordlog-8 "${testcvs} -q update" "[UP] file1"
17811 dotest keywordlog-9 "cat file1" \
17821 dotest keywordlog-10 "${testcvs} ci -m modify file1" \
17826 dotest keywordlog-11 "cat file1" \
17839 dotest keywordlog-12 "${testcvs} -q update" "[UP] file1"
17840 dotest keywordlog-13 "cat file1" \
17853 dotest keywordlog-14 "${testcvs} -q update -r br" "[UP] file1"
17855 dotest keywordlog-15 "${testcvs} -q ci -m br-modify" \
17860 dotest keywordlog-16 "cat file1" \
17872 dotest keywordlog-17 "${testcvs} -q update -r br" "[UP] file1"
17873 dotest keywordlog-18 "cat file1" \
17885 dotest keywordlog-19 "${testcvs} -q co -p -r br first-dir/file1" \
17896 dotest keywordlog-20 "${testcvs} -q co -p first-dir/file1" \
17907 dotest keywordlog-21 "${testcvs} -q co -p -r 1.4 first-dir/file1" \
17925 dotest keywordlog-22 "${testcvs} ann -r br file1" \
17935 dotest keywordlog-23 "${testcvs} ann -r HEAD file1" \
17952 dotest keywordlog-24 \
17958 dotest keywordlog-25 \
17987 dotest keyword2-1 "${testcvs} -q co -l ." ''
17989 dotest keyword2-2 "${testcvs} add first-dir" \
18007 dotest keyword2-3 "${testcvs} add file1" \
18015 dotest keyword2-5 "${testcvs} add -kb binfile.dat" \
18019 dotest keyword2-6 "${testcvs} -q ci -m add" \
18033 dotest keyword2-7 "${testcvs} -q tag -b branch" \
18038 dotest keyword2-8 "${testcvs} -q ci -m change" \
18044 dotest keyword2-9 "${testcvs} -q update -r branch" '[UP] file1'
18047 dotest keyword2-10 "${testcvs} -q ci -m change" \
18054 dotest keyword2-11 "${testcvs} -q update -A -j branch" \
18080 dotest keyword2-13r "${testcvs} -q update -A -kk -j branch" \
18088 dotest keyword2-13 "${testcvs} -q update -A -kk -j branch" \
18100 dotest keyword2-14 "${testcvs} -q ci -m change" \
18110 dotest keyword2-16 "${testcvs} -q update -A" \
18113 dotest keyword2-17 "${testcvs} -q tag -b branch2" \
18116 dotest keyword2-18 "${testcvs} -q update -r branch2" ''
18120 dotest keyword2-19 "${testcvs} -q ci -m badbadbad" \
18125 dotest keyword2-20 "${testcvs} -q update -A -kk -j branch2" \
18164 dotest head-2 "${testcvs} -q co first-dir" \
18169 dotest head-3 "${testcvs} -q ci -m modify" \
18174 dotest head-4 "${testcvs} -q tag trunktag" "T file1
18177 dotest head-5 "${testcvs} -q ci -m modify" \
18182 dotest head-6 "${testcvs} -q tag -b br1" "T file1
18184 dotest head-7 "${testcvs} -q update -r br1" ""
18186 dotest head-8 "${testcvs} -q ci -m modify" \
18191 dotest head-9 "${testcvs} -q tag brtag" "T file1
18194 dotest head-10 "${testcvs} -q ci -m modify" \
18200 dotest head-trunk-setup "${testcvs} -q update -A" "[UP] file1"
18201 dotest head-trunk-update "${testcvs} -q update -r HEAD -p file1" \
18226 dotest head-br1-setup "${testcvs} -q update -r br1" "[UP] file1"
18227 dotest head-br1-update "${testcvs} -q update -r HEAD -p file1" \
18233 dotest head-br1-diff "${testcvs} -q diff -c -r HEAD -r br1" ""
18237 dotest head-brtag-setup "${testcvs} -q update -r brtag" "[UP] file1"
18238 dotest head-brtag-update "${testcvs} -q update -r HEAD -p file1" \
18246 dotest head-brtag-diff "${testcvs} -q diff -c -r HEAD -r br1" ""
18250 dotest head-trunktag-setup "${testcvs} -q update -r trunktag" \
18252 dotest head-trunktag-check "cat file1" "imported contents
18254 dotest head-trunktag-update "${testcvs} -q update -r HEAD -p file1" \
18292 dotest head-o0b "${testcvs} tag -d brtag" \
18296 dotest head-o1 "${testcvs} admin -o ::br1" \
18326 dotest tagdate-1 "${testcvs} -q co -l ." ''
18328 dotest tagdate-2 "${testcvs} add first-dir" \
18333 dotest tagdate-3 "${testcvs} add file1" \
18336 dotest tagdate-4 "${testcvs} -q ci -m add" \
18343 dotest tagdate-5 "${testcvs} -q tag -b br1" "T file1"
18344 dotest tagdate-6 "${testcvs} -q tag -b br2" "T file1"
18346 dotest tagdate-7 "${testcvs} -q ci -m modify-on-trunk" \
18354 dotest tagdate-8 "${testcvs} -q update -p -r br1 -D now" "trunk-1"
18355 dotest tagdate-9 "${testcvs} -q update -r br2" "[UP] file1"
18357 dotest tagdate-10 "${testcvs} -q ci -m modify-on-br2" \
18364 dotest tagdate-11 "${testcvs} -q update -p -r br1 -D now" "trunk-1"
18385 dotest tagdate-13 "${testcvs} -q ci -m modify-2-on-br2" \
18392 dotest tagdate-14 "${testcvs} -q export -r br2 -D'1 minute ago' first-dir" \
18394 dotest tagdate-15 "cat first-dir/file1" "br2-1"
18398 dotest tagdate-16 "${testcvs} annotate -rbr2 -D'1 minute ago'" \
18403 dotest tagdate-17 "${testcvs} annotate -rbr2 -Dnow" \
18424 dotest multibranch2-1 "${testcvs} -q co -l ." ''
18426 dotest multibranch2-2 "${testcvs} add first-dir" \
18432 dotest multibranch2-3 "${testcvs} add file1 file2" \
18436 dotest multibranch2-4 "${testcvs} -q ci -m add" \
18449 dotest multibranch2-5 "${testcvs} -q tag -b A" "T file1
18451 dotest multibranch2-6 "${testcvs} -q tag -b B" "T file1
18454 dotest multibranch2-7 "${testcvs} -q update -r B" ''
18457 dotest multibranch2-8 "${testcvs} -q ci -m modify-on-B" \
18467 dotest multibranch2-9 "${testcvs} -q update -r A" '[UP] file1
18471 dotest multibranch2-10 "${testcvs} -q ci -m modify-on-A" \
18477 dotest multibranch2-11 "${testcvs} -q log file1" \
18507 dotest multibranch2-12 "${testcvs} -q log -r1.1 file1" \
18532 dotest multibranch2-13 "${testcvs} -q update -r B" "[UP] file1
18534 dotest multibranch2-14 "${testcvs} -q update -r A -j B file2" \
18540 dotest multibranch2-15 "${testcvs} -q ci -m commit-on-A file2" \
18565 dotest tag8k-1 "$testcvs -Q import -m . $module X Y" ''
18566 dotest tag8k-2 "$testcvs -Q co $module" ''
18571 dotest tag8k-3 "$testcvs add $file" \
18574 dotest tag8k-4 "$testcvs -Q ci -m . $file" \
18584 dotest tag8k-5 "$testcvs -Q ci -m . $file" \
18597 dotest tag8k-6 "$testcvs -Q tag $t-0 $file" ''
18598 dotest tag8k-7 "$testcvs -Q tag $t-1 $file" ''
18599 dotest tag8k-8 "$testcvs -Q tag $t-2 $file" ''
18600 dotest tag8k-9 "$testcvs -Q tag $t-3 $file" ''
18601 dotest tag8k-10 "$testcvs -Q tag $t-4 $file" ''
18602 dotest tag8k-11 "$testcvs -Q tag $t-5 $file" ''
18603 dotest tag8k-12 "$testcvs -Q tag $t-6 $file" ''
18604 dotest tag8k-13 "$testcvs -Q tag $t-7 $file" ''
18605 dotest tag8k-14 "$testcvs -Q tag $t-8 $file" ''
18606 dotest tag8k-15 "$testcvs -Q tag $t-9 $file" ''
18607 dotest tag8k-16 "$testcvs -Q tag $t-a $file" ''
18620 dotest tag8k-17 "$testcvs -Q tag "x8bytes-$suffix" $file" ''
18624 dotest tag8k-18 "$testcvs -Q ci -m . $file" \
18660 dotest admin-1 "${testcvs} -q co -l ." ''
18662 dotest admin-2 "${testcvs} add first-dir" \
18676 dotest admin-5 "${testcvs} add file1 file2" \
18680 dotest admin-6 "${testcvs} -q ci -m add" \
18693 dotest admin-7 "${testcvs} -q tag -b br" "T file1
18695 dotest admin-8 "${testcvs} -q update -r br" ""
18697 dotest admin-9 "${testcvs} -q ci -m modify-on-branch" \
18702 dotest admin-10 "${testcvs} -q update -A" "U file1"
18728 dotest admin-11 "${testcvs} -q admin -afoo,bar -abaz \
18732 dotest admin-11a "${testcvs} log -N file1" "
18755 dotest admin-12 "${testcvs} -q admin -bbr file1" \
18758 dotest admin-12a "${testcvs} log -N file1" "
18793 dotest admin-13 "cat ${CVSROOT_DIRNAME}/first-dir/file1,v" \
18838 dotest admin-14 "${testcvs} -q admin -aauth3 -aauth2,foo \
18842 dotest admin-15 "${testcvs} -q log file2" "
18864 dotest admin-16 "${testcvs} -q admin \
18868 dotest admin-17 "${testcvs} -q log file1" "
18900 dotest admin-19 "${testcvs} -q admin -ebaz -ebar,auth3 -nbr file1" \
18903 dotest admin-20 "${testcvs} -q log file1" "
18940 dotest admin-19a-admin "${testcvs} -q admin -A../../cvsroot/first-dir/file2,v file1" \
18943 dotest admin-19a-log "${testcvs} -q log -h -N file1" "
18959 dotest admin-19a-2 "${testcvs} -q admin -e file1" \
18962 dotest admin-19a-3 "${testcvs} -q log -h -N file1" "
18974 dotest admin-19a-4 "${testcvs} -q admin -afoo,auth2 file1" \
18980 dotest admin-21 "${testcvs} -q ci -m modify file2" \
18985 dotest admin-22 "${testcvs} -q admin -o1.1 file2" \
18996 dotest admin-22-o1 "${testcvs} add aaa" \
18999 dotest admin-22-o2 "${testcvs} -q ci -m first aaa" \
19007 dotest admin-22-o3 "${testcvs} -q ci -m second aaa" \
19013 dotest admin-22-o4 "${testcvs} -q ci -m third aaa" \
19019 dotest admin-22-o5 "${testcvs} -q ci -m fourth aaa" \
19025 dotest admin-22-o6 "${testcvs} -q ci -m fifth aaa" \
19031 dotest admin-22-o7 "${testcvs} -q ci -m sixth aaa" \
19036 dotest admin-22-o8 "${testcvs} admin -l1.6 aaa" \
19040 dotest admin-22-o9 "${testcvs} log -r1.6 aaa" "
19061 dotest admin-22-o11 "${testcvs} admin -u aaa" \
19065 dotest admin-22-o12 "${testcvs} admin -o1.5: aaa" \
19070 dotest admin-22-o13 "${testcvs} log aaa" "
19099 dotest admin-22-o14 "${testcvs} tag -b -r1.3 br1 aaa" "T aaa"
19100 dotest admin-22-o15 "${testcvs} update -rbr1 aaa" "U aaa"
19102 dotest admin-22-o16 "${testcvs} ci -m new-branch aaa" \
19112 dotest admin-22-o18 "${testcvs} update -p -r1.4 aaa" \
19123 dotest admin-22-o19 "${testcvs} ci -m branch-two aaa" \
19129 dotest admin-22-o20 "${testcvs} ci -m branch-three aaa" \
19135 dotest admin-22-o21 "${testcvs} ci -m branch-four aaa" \
19140 dotest admin-22-o22 "${testcvs} admin -o:1.3.2.3 aaa" \
19146 dotest admin-22-o23 "${testcvs} log aaa" "
19181 dotest admin-22-o24 "${testcvs} -q update -p -r 1.3.2.4 aaa" \
19194 dotest admin-23 "${testcvs} -q log file2" "
19216 dotest admin-25 "cat ${CVSROOT_DIRNAME}/first-dir/file1,v" \
19266 dotest admin-26-1 "${testcvs} admin -ntagtwo:tagone file2" \
19272 dotest admin-26-2 "${testcvs} admin -nbr1:br file2" \
19278 dotest admin-26-3 "${testcvs} admin -ntagthree:1.1 file2" \
19282 dotest admin-26-4 "${testcvs} admin -nbr2:1.1.2 file2" \
19286 dotest admin-26-5 "${testcvs} admin -nbr4:1.1.0.2 file2" \
19292 dotest admin-26-6 "${testcvs} status -v file2" \
19315 dotest admin-27-1 "${testcvs} commit -m nuthr_line file2" \
19322 dotest admin-27-2 "${testcvs} commit -m yet_another file2" \
19330 dotest admin-27-3 "${testcvs} admin -ntagfour:1.1 file2" \
19341 dotest admin-27-5 "${testcvs} admin -Ntagfour:1.3 file2" \
19370 dotest admin-28-5.1 "${testcvs} -Q tag BO+GUS file1" ''
19384 dotest admin-29 "cat ${CVSROOT_DIRNAME}/first-dir/file2,v" \
19470 dotest reserved-1 "${testcvs} -q co -l ." ''
19472 dotest reserved-2 "${testcvs} add first-dir" \
19476 dotest reserved-3 "${testcvs} add file1" \
19479 dotest reserved-4 "${testcvs} -q ci -m add" \
19487 dotest reserved-5 "${testcvs} -q admin -l file1" \
19491 dotest reserved-6 "${testcvs} log -N file1" "
19510 dotest reserved-7 "${testcvs} -q admin -u file1" \
19515 dotest reserved-8 "${testcvs} log -N file1" "
19555 dotest reserved-9 "${testcvs} add a-lock" \
19558 dotest reserved-10 "${testcvs} -q ci -m new a-lock" \
19577 dotest reserved-12 "${testcvs} -q ci -m rcslock commitinfo" \
19589 dotest reserved-13 "mv a-lock,v ${CVSROOT_DIRNAME}/first-dir/a-lock,v"
19602 dotest reserved-14 "${testcvs} admin -u1.1 a-lock" \
19606 dotest reserved-15 "${testcvs} -q ci -m success a-lock" \
19615 dotest reserved-16 \
19618 dotest reserved-17 "${testcvs} -q tag -b br a-lock" "T a-lock"
19619 dotest reserved-18 "${testcvs} -q update -r br a-lock" ""
19621 dotest reserved-19 "${testcvs} -q ci -m modify a-lock" \
19630 dotest reserved-cleanup-1 "${testcvs} -q ci -m back commitinfo" \
19682 dotest diffmerge1_import \
19705 dotest diffmerge1_yours "${testcvs} -q ci -m yours" \
19751 dotest diffmerge1_mine "${testcvs} -q update -j tag" \
19815 #dotest diffmerge1_cmp "diff -u --recursive --exclude=CVS comp_me mine" ''
19816 dotest diffmerge1_cmp "directory_cmp comp_me mine"
20495 dotest diffmerge2_co \
20498 dotest diffmerge2_update \
20502 dotest diffmerge2_diff \
20523 dotest release-1 "${testcvs} -q co -l ." ''
20525 dotest release-2 "${testcvs} add first-dir" \
20529 dotest release-3 "${testcvs} add dir1" \
20532 dotest release-4 "${testcvs} add dir2" \
20536 dotest release-5 "${testcvs} add dir3" \
20540 dotest release-6 "${testcvs} release -d first-dir/dir2/dir3 first-dir/dir1" \
20550 dotest release-9 "${testcvs} update" \
20557 dotest release-10 "${testcvs} add dir1" \
20561 dotest release-11 "${testcvs} add dir3" \
20565 dotest release-12 "${testcvs} release first-dir/dir2/dir3 first-dir/dir1" \
20573 dotest release-13 "${testcvs} release first-dir/dir2/dir3 first-dir/dir2" \
20581 dotest release-14 "test -d first-dir/dir1" ''
20582 dotest release-15 "test -d first-dir/dir2/dir3" ''
20585 dotest release-16 "${testcvs} update" \
20609 dotest multiroot-setup-1 "mkdir ${CVSROOT1_DIRNAME} ${CVSROOT2_DIRNAME}" ""
20610 dotest multiroot-setup-2 "${testcvs1} init" ""
20611 dotest multiroot-setup-3 "${testcvs2} init" ""
20617 dotest multiroot-setup-4 "${testcvs1} co -l ." "${PROG} [a-z]*: Updating ."
20619 dotest multiroot-setup-5 "${testcvs1} add mod1-1 mod1-2" \
20624 dotest multiroot-setup-6 "${testcvs1} add mod1-1/file1-1 mod1-2/file1-2" \
20628 dotest multiroot-setup-7 "${testcvs1} commit -m is" \
20651 dotest multiroot-setup-8 "${testcvs2} co -l ." "${PROG} [a-z]*: Updating ."
20653 dotest multiroot-setup-9 "${testcvs2} add mod2-1 mod2-2" \
20658 dotest multiroot-setup-6 "${testcvs2} add mod2-1/file2-1 mod2-2/file2-2" \
20662 dotest multiroot-setup-10 "${testcvs2} commit -m anyone" \
20698 dotest multiroot-workaround "${testcvs1} -q co -l ." ""
20700 dotest multiroot-setup-11 "${testcvs1} co mod1-1 mod1-2" \
20705 dotest multiroot-setup-12 "${testcvs2} co mod2-1 mod2-2" \
20711 dotest multiroot-setup-13 "${testcvs2} co mod2-2" \
20716 dotest multiroot-setup-14 "${testcvs1} co mod1-2" \
20725 echo "${CVSROOT1_DIRNAME}/mod1-1" > dotest.abs
20726 echo "mod1-1" > dotest.rel
20727 if cmp dotest.abs mod1-1/CVS/Repository >/dev/null 2>&1; then
20730 elif cmp dotest.rel mod1-1/CVS/Repository >/dev/null 2>&1; then
20736 rm -f dotest.abs dotest.rel
20742 dotest multiroot-cvsadm-1a "cat mod1-1/CVS/Root" "${CVSROOT1}"
20743 dotest multiroot-cvsadm-1b "cat mod1-1/CVS/Repository" "${AREP1}mod1-1"
20744 dotest multiroot-cvsadm-2a "cat mod2-1/CVS/Root" "${CVSROOT2}"
20745 dotest multiroot-cvsadm-2b "cat mod2-1/CVS/Repository" "${AREP2}mod2-1"
20746 dotest multiroot-cvsadm-3a "cat mod1-2/CVS/Root" "${CVSROOT1}"
20747 dotest multiroot-cvsadm-3b "cat mod1-2/CVS/Repository" "${AREP1}mod1-2"
20748 dotest multiroot-cvsadm-3c "cat mod1-2/mod2-2/CVS/Root" "${CVSROOT2}"
20749 dotest multiroot-cvsadm-3d "cat mod1-2/mod2-2/CVS/Repository" "${AREP2}mod2-2"
20750 dotest multiroot-cvsadm-4a "cat mod2-2/CVS/Root" "${CVSROOT2}"
20751 dotest multiroot-cvsadm-4b "cat mod2-2/CVS/Repository" "${AREP2}mod2-2"
20752 dotest multiroot-cvsadm-4c "cat mod2-2/mod1-2/CVS/Root" "${CVSROOT1}"
20753 dotest multiroot-cvsadm-4d "cat mod2-2/mod1-2/CVS/Repository" "${AREP1}mod1-2"
20767 dotest multiroot-update-1a "${testcvs1} update" \
20782 dotest multiroot-update-1b "${testcvs2} update" \
20808 dotest multiroot-update-1a "${testcvs1} update" \
20823 dotest multiroot-update-1b "${testcvs2} update" \
20916 dotest multiroot-commit-1 "${testcvs} commit -m actually" \
20941 dotest multiroot-update-2 "${testcvs} update" \
20963 dotest multiroot-tag-1 "${testcvs} tag cattle" \
20996 dotest multiroot-add-1ar "${testcvs} add anotherfile1-1" \
21000 dotest multiroot-add-1br "${testcvs} add anotherfile2-1" \
21004 dotest multiroot-add-1cr "${testcvs} add anotherfile1-2" \
21008 dotest multiroot-add-1dr "${testcvs} add anotherfile2-2" \
21013 dotest multiroot-add-1 "${testcvs} add mod1-1/anotherfile1-1 mod2-1/anotherfile2-1 mod2-2/mod1-2/anotherfile1-2 mod1-2/mod2-2/anotherfile2-2" \
21021 dotest multiroot-status-1 "${testcvs} status -v" \
21253 dotest multiroot-commit-2 "${testcvs} commit -m reading" \
21286 dotest multiroot-update-3 "${testcvs} update" \
21308 dotest multiroot-log-1 "${testcvs} log" \
21800 dotest multiroot2-1 "${testcvs} -d ${CVSROOT1} init" ""
21801 dotest multiroot2-2 "${testcvs} -d ${CVSROOT2} init" ""
21830 dotest multiroot2-5 "${testcvs} -d ${CVSROOT1} -q co -l ."
21831 dotest multiroot2-5 "${testcvs} -d ${CVSROOT1} -q co dir1" \
21836 dotest multiroot2-6 "${testcvs} -Q release -d sdir" ""
21837 dotest multiroot2-7 "${testcvs} -d ${CVSROOT2} -q co sdir" \
21844 dotest multiroot2-8 "${testcvs} update" \
21859 dotest multiroot2-9 "${testcvs} -t update" \
21868 dotest multiroot2-9 "${testcvs} -q tag tag1" \
21874 dotest multiroot2-10 "${testcvs} -q ci -m modify" \
21883 dotest multiroot2-11 "${testcvs} -q tag tag2" \
21939 dotest multiroot3-1 "${testcvs} -d ${CVSROOT1} init" ""
21940 dotest multiroot3-2 "${testcvs} -d ${CVSROOT1} -q co -l ." ""
21942 dotest multiroot3-3 "${testcvs} add dir1" \
21944 dotest multiroot3-4 "${testcvs} -d ${CVSROOT2} init" ""
21946 dotest multiroot3-5 "${testcvs} -d ${CVSROOT2} -q co -l ." ""
21952 dotest multiroot3-6 "${testcvs} -d ${CVSROOT1} -q co dir1" ""
21959 dotest multiroot3-7 "${testcvs} add dir2" \
21969 dotest multiroot3-8 "${testcvs} add file1" \
21973 dotest multiroot3-8a "${testcvs} add dir2/file2" \
21977 dotest multiroot3-8 "${testcvs} add dir1/file1 dir2/file2" \
21983 dotest multiroot3-9 "${testcvs} -q ci -m add-them" \
22017 dotest multiroot3-10 \
22022 dotest multiroot3-11 "${testcvs} -q diff dir1/file1 dir2/file2" ""
22080 dotest multiroot4-1 "${testcvs} -d ${CVSROOT1} init" ""
22081 dotest multiroot4-2 "${testcvs} -d ${CVSROOT1} -q co -l ." ""
22083 dotest multiroot4-3 "${testcvs} add dircom" \
22087 dotest multiroot4-4 "${testcvs} add file1" \
22090 dotest multiroot4-5 "${testcvs} -q ci -m add" \
22099 dotest multiroot4-6 "${testcvs} -d ${CVSROOT2} init" ""
22100 dotest multiroot4-7 "${testcvs} -d ${CVSROOT2} -q co -l ." ""
22102 dotest multiroot4-8 "${testcvs} add dircom" \
22106 dotest multiroot4-9 "${testcvs} add file2" \
22109 dotest multiroot4-10 "${testcvs} -q ci -m add" \
22124 dotest multiroot4-11 "${testcvs} -d ${CVSROOT2} add sdir2" \
22127 dotest multiroot4-12 "${testcvs} -q update" ""
22129 dotest multiroot4-13 "${testcvs} -q update dircom" ""
22149 dotest rmroot-setup-1 "${testcvs} -q co -l ." ''
22151 dotest rmroot-setup-2 "${testcvs} add first-dir" \
22155 dotest rmroot-setup-3 "${testcvs} add file1 file2" \
22159 dotest rmroot-setup-4 "${testcvs} -q commit -minit" \
22173 dotest rmroot-1 "${testcvs} -q update" ''
22192 dotest reposmv-setup-1 "${testcvs} -d ${CVSROOT1} init" ""
22195 dotest reposmv-setup-2 \
22203 dotest reposmv-1 "${testcvs} -d ${CVSROOT1} -Q co dir1" ""
22208 dotest reposmv-1a "cat CVS/Repository" \
22220 dotest reposmv-2 "${testcvs} update" "${DOTSTAR}
22237 dotest reposmv-3 "${testcvs} update" \
22270 dotest reposmv-5 "${testcvs} -d ${CVSROOT_MOVED} update" \
22291 dotest pserver-1 "${testcvs} -Q co CVSROOT" ""
22294 dotest pserver-2 "${testcvs} -q ci -m config-it" \
22318 dotest pserver-4 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22330 dotest pserver-5 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22361 dotest pserver-8 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22373 dotest pserver-9 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22383 dotest pserver-10 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22393 dotest pserver-11 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22403 dotest pserver-12 "${testcvs} --allow-root=${CVSROOT_DIRNAME} pserver" \
22424 dotest pserver-cleanup-1 "${testcvs} -q ci -m config-it" \
22439 dotest server-1 "${testcvs} server" \
22449 dotest server-2 "${testcvs} server" "ok" <<EOF
22454 dotest server-3 "test -d ${TESTDIR}/crerepos/CVSROOT" ""
22481 dotest server-4 "${testcvs} server" \
22487 dotest server-5 \
22491 dotest server-6 "${testcvs} server" \
22505 dotest server-7 "${testcvs} server" \
22525 dotest server-8 "${testcvs} server" \
22538 dotest server-9 "${testcvs} server" \
22554 dotest server-10 "${testcvs} server" "ok" <<EOF
22561 dotest server-11 "${testcvs} server" \
22570 dotest server-12 "${testcvs} server" \
22581 dotest server-13 "${testcvs} server" \
22594 dotest server-14 "${testcvs} server" "ok" <<EOF
22600 dotest server-15 "${testcvs} server" "ok" <<EOF
22621 dotest server2-1 "${testcvs} server" \
22630 dotest server2-2 "${testcvs} server" \
22639 dotest 2-3 "${testcvs} server" \
22652 dotest server2-4 "${testcvs} server" \
22691 dotest client-2 "${testcvs} co first-dir" "special message"
22733 dotest client-4 "${testcvs} update" "merge-it"
22734 dotest client-5 "cat .#file1.1.1" "xyz"
22735 dotest client-6 "cat CVS/Entries" "/file1/1.2/[A-Za-z0-9 :]*//
22737 dotest client-7 "cat file1" "abc"
22750 dotest client-8 "${testcvs} update -D 99-10-04" "OK, whatever"
22751 dotest client-9 "cat ${TESTDIR}/client.tmp" \
22790 dotest fork-1 "$testcvs -d:fork:$CVSROOT_DIRNAME version" \