/[cvs]/ccvs/src/sanity.sh
ViewVC logotype

Diff of /ccvs/src/sanity.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1095.4.19 by dprice, Thu Dec 1 01:48:59 2005 UTC revision 1.1095.4.20 by dprice, Thu Dec 1 03:37:49 2005 UTC
# Line 11180  C $file" Line 11180  C $file"
11180            dotest join-admin-0-9 "$testcvs -Q tag -b M2" ''            dotest join-admin-0-9 "$testcvs -Q tag -b M2" ''
11181    
11182            dotest join-admin-0-10 "$testcvs -Q update -r B" ''            dotest join-admin-0-10 "$testcvs -Q update -r B" ''
11183            dotest join-admin-0-11 "$testcvs -Q update -kk -jM1 -jM2" ''            dotest join-admin-0-11 "$testcvs -Q update -kk -jM1 -jM2"
11184            dotest join-admin-0-12 "$testcvs -Q ci -m. b"            dotest join-admin-0-12 "$testcvs -Q ci -m. b"
11185    
11186            dotest join-admin-0-13 "$testcvs -Q update -A" ''            dotest join-admin-0-13 "$testcvs -Q update -A" ''
# Line 11242  File: b                        Status: Up-to-da Line 11242  File: b                        Status: Up-to-da
11242    
11243            dotest join-admin-2-13 "$testcvs -Q update -r T" '' "${QUESTION} e0"            dotest join-admin-2-13 "$testcvs -Q update -r T" '' "${QUESTION} e0"
11244            dotest join-admin-2-14 "$testcvs update -kk -jM1 -jM2" \            dotest join-admin-2-14 "$testcvs update -kk -jM1 -jM2" \
11245  "${SPROG} update: Updating .  "$SPROG update: Updating .
11246  U b  $SPROG update: scheduling addition from revision 1\.1 of \`b'\.
11247  U e  U e
11248  Merging differences between 1\.1 and 1\.2 into \`e'  Merging differences between 1\.1 and 1\.2 into \`e'
11249  \`e' already contains the differences between 1\.1 and 1\.2  \`e' already contains the differences between 1\.1 and 1\.2
11250  ${QUESTION} e0" \  $QUESTION e0" \
11251  "${QUESTION} e0  "$QUESTION e0
11252  ${SPROG} update: Updating .  $SPROG update: Updating .
11253  U b  $SPROG update: scheduling addition from revision 1\.1 of \`b'\.
11254  U e  U e
11255  Merging differences between 1\.1 and 1\.2 into \`e'  Merging differences between 1\.1 and 1\.2 into \`e'
11256  \`e' already contains the differences between 1\.1 and 1\.2"  \`e' already contains the differences between 1\.1 and 1\.2"
# Line 11373  File: a                        Status: Up-to-da Line 11373  File: a                        Status: Up-to-da
11373            dokeep            dokeep
11374            cd ../..            cd ../..
11375            modify_repo rm -rf $CVSROOT_DIRNAME/$module            modify_repo rm -rf $CVSROOT_DIRNAME/$module
11376            rm -r $module            rm -rf $module
11377            ;;            ;;
11378    
11379    
# Line 11448  ${SPROG} remove: use .${SPROG} commit. t Line 11448  ${SPROG} remove: use .${SPROG} commit. t
11448  "$CVSROOT_DIRNAME/first-dir/a,v  <--  a  "$CVSROOT_DIRNAME/first-dir/a,v  <--  a
11449  new revision: delete; previous revision: 1\.1"  new revision: delete; previous revision: 1\.1"
11450    
11451            # Check out the file on the branch.  This should report            # Check out the file on the branch.  This used to say the file
11452            # that the file is not pertinent, but it should not            # wasn't pertinent, but this wasn't the same behavior as update.
           # say anything else.  
11453            cd ..            cd ..
11454            rm -r first-dir            rm -r first-dir
11455            dotest newb-123i "${testcvs} -q co -r branch first-dir/a" \            dotest newb-123i "$testcvs -q co -r branch first-dir/a"
 "${SPROG} checkout: warning: \`first-dir/a' is not (any longer) pertinent"  
11456    
11457            # Update the other copy, and make sure that a is removed.            # Update the other copy, and make sure that a is removed.
11458            cd ../1/first-dir            cd ../1/first-dir
# Line 11568  File: a                        Status: Needs Me Line 11566  File: a                        Status: Needs Me
11566                  dotest conflicts-129a "${testcvs} -nq update a" \                  dotest conflicts-129a "${testcvs} -nq update a" \
11567  "Merging differences between 1\.1 and 1\.2 into \`a'  "Merging differences between 1\.1 and 1\.2 into \`a'
11568  $CPROG update: conflicts during merge"  $CPROG update: conflicts during merge"
11569                  dotest conflicts-130 "${testcvs} -q update" \                  dotest conflicts-130 "$testcvs -q update" \
11570  "Merging differences between 1\.1 and 1\.2 into \`a'  "Merging differences between 1\.1 and 1\.2 into \`a'
11571  $CPROG update: conflicts during merge  $CPROG update: conflicts during merge
11572  ${QUESTION} dir1  C a
11573  ${QUESTION} sdir" \  $QUESTION dir1
11574  "${QUESTION} dir1  $QUESTION sdir" \
11575  ${QUESTION} sdir  "$QUESTION dir1
11576    $QUESTION sdir
11577  Merging differences between 1\.1 and 1\.2 into \`a'  Merging differences between 1\.1 and 1\.2 into \`a'
11578  $CPROG update: conflicts during merge"  $CPROG update: conflicts during merge
11579    C a"
11580                  rmdir dir1 sdir                  rmdir dir1 sdir
11581    
11582                  dotest conflicts-status-1 "${testcvs} status a" \                  dotest conflicts-status-1 "${testcvs} status a" \
# Line 11700  File: a                        Status: Up-to-da Line 11700  File: a                        Status: Up-to-da
11700    
11701                  dokeep                  dokeep
11702                  cd ../..                  cd ../..
11703                  rm -r 1 2 3                  rm -rf 1 2 3
11704                  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir                  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
11705                  restore_adm                  restore_adm
11706                  ;;                  ;;
# Line 11866  initial revision: 1\.1" Line 11866  initial revision: 1\.1"
11866            # the local CVS behavior for remote without the cvs add seems            # the local CVS behavior for remote without the cvs add seems
11867            # pretty difficult).            # pretty difficult).
11868            if $remote; then            if $remote; then
11869              dotest_fail conflicts2-142d2r "${testcvs} -q update" \              dotest_fail conflicts2-142d2r "$testcvs -q update" \
11870  "${QUESTION} aa\.c  "$QUESTION aa\.c
11871  ${QUESTION} same\.c  $QUESTION same\.c
11872  ${CPROG} update: move away \`\./aa\.c'; it is in the way  $CPROG update: move away \`aa\.c'; it is in the way
11873  C aa\.c  C aa\.c
11874  ${SPROG} update: conflict: \`bb\.c' created independently by second party  $SPROG update: conflict: \`bb\.c' created independently by second party
11875  C bb\.c  C bb\.c
11876  ${CPROG} update: move away \`\./same\.c'; it is in the way  $CPROG update: move away \`same\.c'; it is in the way
11877  C same\.c"  C same\.c"
11878            else            else
11879              dotest_fail conflicts2-142d2 "${testcvs} -q update" \              dotest_fail conflicts2-142d2 "${testcvs} -q update" \
# Line 11944  File: bb\.c                    Status: Unresol Line 11944  File: bb\.c                    Status: Unresol
11944    
11945            dokeep            dokeep
11946            cd ../..            cd ../..
11947            rm -r 1 2            rm -rf 1 2
11948            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
11949            ;;            ;;
11950    
# Line 12074  ${SPROG} update: ignoring first-dir/sdir Line 12074  ${SPROG} update: ignoring first-dir/sdir
12074            cd first-dir            cd first-dir
12075    
12076            dotest conflicts3-21 "${testcvs} -q update -d sdir" "U sdir/sfile"            dotest conflicts3-21 "${testcvs} -q update -d sdir" "U sdir/sfile"
12077            rm -r sdir/CVS            rm -rf sdir/CVS
12078            dotest conflicts3-22 "${testcvs} -q update" "${QUESTION} sdir"            dotest conflicts3-22 "${testcvs} -q update" "${QUESTION} sdir"
12079            if $remote; then            if $remote; then
12080              dotest_fail conflicts3-23 "${testcvs} -q update -PdA" \              dotest_fail conflicts3-23 "${testcvs} -q update -PdA" \
# Line 12092  C sdir/sfile" Line 12092  C sdir/sfile"
12092            # by removing each file (and using update -P or some such).  Then            # by removing each file (and using update -P or some such).  Then
12093            # suppose that the build process creates an sdir directory which            # suppose that the build process creates an sdir directory which
12094            # is not supposed to be under CVS.            # is not supposed to be under CVS.
12095            rm -r sdir            rm -rf sdir
12096            dotest conflicts3-24 "${testcvs} -q update -d sdir" "U sdir/sfile"            dotest conflicts3-24 "${testcvs} -q update -d sdir" "U sdir/sfile"
12097            rm sdir/sfile            rm sdir/sfile
12098            dotest conflicts3-25 "${testcvs} rm sdir/sfile" \            dotest conflicts3-25 "${testcvs} rm sdir/sfile" \
# Line 12595  Are you sure you want to release (and de Line 12595  Are you sure you want to release (and de
12595            # (Dec 95).  Probably the exit status should be nonzero,            # (Dec 95).  Probably the exit status should be nonzero,
12596            # however.            # however.
12597            dotest modules-150g1 "${testcvs} co dirmodule/nonexist" \            dotest modules-150g1 "${testcvs} co dirmodule/nonexist" \
12598  "${SPROG} checkout: warning: new-born \`dirmodule/nonexist' has disappeared"  "$SPROG checkout: nothing known about \`dirmodule/nonexist'"
12599            # We tolerate the creation of the dirmodule directory, since that            # We tolerate the creation of the dirmodule directory, since that
12600            # is what CVS does, not because we view that as preferable to not            # is what CVS does, not because we view that as preferable to not
12601            # creating it.            # creating it.
12602            dotest_fail modules-150g2 "test -f dirmodule/a || test -f dirmodule/b" ""            dotest_fail modules-150g2 "test -f dirmodule/a || test -f dirmodule/b"
12603            rm -r dirmodule            rm -r dirmodule
12604    
12605            # Now test that a module using -d checks out to the specified            # Now test that a module using -d checks out to the specified
# Line 12621  Are you sure you want to release (and de Line 12621  Are you sure you want to release (and de
12621            dotest modules-151 "${testcvs} co aliasmodule" ""            dotest modules-151 "${testcvs} co aliasmodule" ""
12622            dotest_fail modules-152 "test -d aliasmodule" ""            dotest_fail modules-152 "test -d aliasmodule" ""
12623            echo abc >>first-dir/subdir/a            echo abc >>first-dir/subdir/a
12624            dotest modules-153 "${testcvs} -q co aliasmodule" "M first-dir/subdir/a"            dotest modules-153 "$testcvs -q co aliasmodule" "M first-dir/subdir/a"
12625    
12626            cd ..            cd ..
12627            rm -r 1            rm -rf 1
12628    
12629            mkdir 2            mkdir 2
12630            cd 2            cd 2
# Line 12648  first-dir" Line 12648  first-dir"
12648  U first-dir/subdir/a  U first-dir/subdir/a
12649  U first-dir/subdir/b"  U first-dir/subdir/b"
12650            cd ..            cd ..
12651            rm -r 1            rm -rf 1
12652    
12653            # Test checking out a module which lists at least two            # Test checking out a module which lists at least two
12654            # specific files twice.  At one time, this failed over            # specific files twice.  At one time, this failed over
# Line 12666  U first-dir/subdir/b" Line 12666  U first-dir/subdir/b"
12666  "${SPROG}"' add: scheduling file `file1'\'' for addition  "${SPROG}"' add: scheduling file `file1'\'' for addition
12667  '"${SPROG}"' add: scheduling file `file2'\'' for addition  '"${SPROG}"' add: scheduling file `file2'\'' for addition
12668  '"${SPROG}"' add: use .'"${SPROG}"' commit. to add these files permanently'  '"${SPROG}"' add: use .'"${SPROG}"' commit. to add these files permanently'
12669            dotest modules-155c3 "${testcvs} -q ci -m add-it" \            dotest modules-155c3 "$testcvs -q ci -m add-it" \
12670  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
12671  initial revision: 1\.1  initial revision: 1\.1
12672  $CVSROOT_DIRNAME/first-dir/file2,v  <--  file2  $CVSROOT_DIRNAME/first-dir/file2,v  <--  file2
12673  initial revision: 1\.1"  initial revision: 1\.1"
12674    
12675            cd ..            cd ..
12676            rm -r first-dir            rm -rf first-dir
12677            dotest modules-155c4 "${testcvs} -q co topfiles" \            dotest modules-155c4 "${testcvs} -q co topfiles" \
12678  "U first-dir/file1  "U first-dir/file1
12679  U first-dir/file2"  U first-dir/file2"
# Line 12687  U first-dir/file2" Line 12687  U first-dir/file2"
12687  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
12688  new revision: delete; previous revision: 1\.1"  new revision: delete; previous revision: 1\.1"
12689            cd ..            cd ..
12690            rm -r first-dir            rm -rf first-dir
12691            dotest modules-155c8 "${testcvs} -q co topfiles" \            dotest modules-155c8 "$testcvs -q co topfiles" \
12692  "${SPROG} checkout: warning: \`first-dir/file1' is not (any longer) pertinent  "U first-dir/file2"
 U first-dir/file2"  
12693    
12694            dokeep            dokeep
12695            cd ..            cd ..
12696            rm -r 1            rm -rf 1
12697            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
12698            ;;            ;;
12699    
# Line 12832  initial revision: 1\.1" Line 12831  initial revision: 1\.1"
12831  ${SPROG} checkout: Updating first-dir  ${SPROG} checkout: Updating first-dir
12832  U first-dir/amper1"  U first-dir/amper1"
12833            dotest modules2-15 "test -f combmodule/file3" ""            dotest modules2-15 "test -f combmodule/file3" ""
12834            dotest modules2-16 "test -f combmodule/first-dir/amper1" ""            dotest modules2-16 "test -f combmodule/first-dir/amper1"
12835            cd combmodule            cd combmodule
12836            rm -r first-dir            rm -rf first-dir
12837            # At least for now there is no way to tell CVS that            # At least for now there is no way to tell CVS that
12838            # some files/subdirectories come from one repository directory,            # some files/subdirectories come from one repository directory,
12839            # and others from another.            # and others from another.
# Line 12850  U first-dir/amper1" Line 12849  U first-dir/amper1"
12849  "U first-dir/amper1"  "U first-dir/amper1"
12850            dotest modules2-19 "test -f combmodule/first-dir/amper1" ""            dotest modules2-19 "test -f combmodule/first-dir/amper1" ""
12851            cd ..            cd ..
12852            rm -r 1            rm -rf 1
12853    
12854            # Now test the "ampdirmod" and "badmod" modules to be sure that            # Now test the "ampdirmod" and "badmod" modules to be sure that
12855            # options work with ampersand modules but don't prevent the            # options work with ampersand modules but don't prevent the
# Line 12867  ${SPROG} checkout: Updating second-dir" Line 12866  ${SPROG} checkout: Updating second-dir"
12866  "${SPROG} server: modules file missing directory for module badmod  "${SPROG} server: modules file missing directory for module badmod
12867  ${CPROG} \[checkout aborted\]: cannot expand modules"  ${CPROG} \[checkout aborted\]: cannot expand modules"
12868            cd ..            cd ..
12869            rm -r 1            rm -rf 1
12870    
12871            # Confirm that a rename with added depth nested in an ampersand            # Confirm that a rename with added depth nested in an ampersand
12872            # module works.            # module works.
# Line 12878  ${CPROG} \[checkout aborted\]: cannot ex Line 12877  ${CPROG} \[checkout aborted\]: cannot ex
12877            dotest modules2-nestedrename-3 "test -d messymod/sdir/CVS" ''            dotest modules2-nestedrename-3 "test -d messymod/sdir/CVS" ''
12878            dotest modules2-nestedrename-4 "test -d messymod/sdir/child" ''            dotest modules2-nestedrename-4 "test -d messymod/sdir/child" ''
12879            dotest modules2-nestedrename-5 "test -d messymod/sdir/child/CVS" ''            dotest modules2-nestedrename-5 "test -d messymod/sdir/child/CVS" ''
12880            cd ..; rm -r 1            cd ..; rm -rf 1
12881    
12882            # FIXME:  client/server has a bug.  It should be working like a local            # FIXME:  client/server has a bug.  It should be working like a local
12883            # repository in this case, but fails to check out the second module            # repository in this case, but fails to check out the second module
# Line 12890  ${CPROG} \[checkout aborted\]: cannot ex Line 12889  ${CPROG} \[checkout aborted\]: cannot ex
12889            dotest modules2-ampertag-1 "${testcvs} -q co -rtag ampermodule" \            dotest modules2-ampertag-1 "${testcvs} -q co -rtag ampermodule" \
12890  "U first-dir/amper1"  "U first-dir/amper1"
12891            if $remote; then            if $remote; then
12892              dotest_fail modules2-ampertag-2 "test -d ampermodule/second-dir" ''              dotest_fail modules2-ampertag-2r "test -d ampermodule/second-dir" ''
12893              dotest_fail modules2-ampertag-3 "test -d ampermodule/second-dir/CVS" ''              dotest_fail modules2-ampertag-3r "test -d ampermodule/second-dir/CVS" ''
12894            else            else
12895              dotest modules2-ampertag-2 "test -d ampermodule/second-dir" ''              dotest modules2-ampertag-2 "test -d ampermodule/second-dir" ''
12896              dotest modules2-ampertag-3 "test -d ampermodule/second-dir/CVS" ''              dotest modules2-ampertag-3 "test -d ampermodule/second-dir/CVS" ''
12897            fi            fi
12898            cd ..; rm -r 1            cd ..; rm -rf 1
12899    
12900            # Test for tag files when an ampermod is renamed with more path            # Test for tag files when an ampermod is renamed with more path
12901            # elements than it started with.            # elements than it started with.
# Line 12914  ${CPROG} \[checkout aborted\]: cannot ex Line 12913  ${CPROG} \[checkout aborted\]: cannot ex
12913            else            else
12914              dotest modules2-tagfiles-2 "cat messymod/sdir/CVS/Tag" 'Ttag'              dotest modules2-tagfiles-2 "cat messymod/sdir/CVS/Tag" 'Ttag'
12915            fi            fi
12916            cd ..; rm -r 1            cd ..; rm -rf 1
12917    
12918            # Test that CVS gives an error if one combines -a with            # Test that CVS gives an error if one combines -a with
12919            # other options.            # other options.
# Line 12989  $SPROG commit: Rebuilding administrative Line 12988  $SPROG commit: Rebuilding administrative
12988            rm -r first-dir            rm -r first-dir
12989            dotest modules3-7 "${testcvs} -q co bigmod" 'U first-dir/file1'            dotest modules3-7 "${testcvs} -q co bigmod" 'U first-dir/file1'
12990            cd ..            cd ..
12991            rm -r 1            rm -rf 1
12992    
12993            mkdir 1; cd 1            mkdir 1; cd 1
12994            mkdir suba            mkdir suba
# Line 13041  initial revision: 1\.1" Line 13040  initial revision: 1\.1"
13040  'U src/sub/dir/file1'  'U src/sub/dir/file1'
13041            dotest modules3-9 "test -f src/sub/dir/file1" ''            dotest modules3-9 "test -f src/sub/dir/file1" ''
13042            cd ..            cd ..
13043            rm -r 1            rm -rf 1
13044    
13045            # Try the same thing, but with the directories nested even            # Try the same thing, but with the directories nested even
13046            # deeper (deeply enough so they are nested more deeply than            # deeper (deeply enough so they are nested more deeply than
# Line 13055  initial revision: 1\.1" Line 13054  initial revision: 1\.1"
13054            # While we are doing things like twisted uses of '/' (e.g.            # While we are doing things like twisted uses of '/' (e.g.
13055            # modules3-12), try this one.            # modules3-12), try this one.
13056            if $remote; then            if $remote; then
13057              dotest_fail modules3-11b \              dotest_fail modules3-11br \
13058  "${testcvs} -q update ${TESTDIR}/1/src/sub1/sub2/sub3/dir/file1" \  "${testcvs} -q update ${TESTDIR}/1/src/sub1/sub2/sub3/dir/file1" \
13059  "absolute pathnames invalid for server (specified .${TESTDIR}/1/src/sub1/sub2/sub3/dir.)"  "absolute pathnames invalid for server (specified .${TESTDIR}/1/src/sub1/sub2/sub3/dir.)"
13060            fi # end of remote-only tests            fi # end of remote-only tests
13061    
13062            cd ..            cd ..
13063            rm -r 1            rm -rf 1
13064    
13065            # This one is almost too twisted for words.  The pathname output            # This one is almost too twisted for words.  The pathname output
13066            # in the message from "co" doesn't include the "path/in/modules",            # in the message from "co" doesn't include the "path/in/modules",
# Line 13105  initial revision: 1\.1" Line 13104  initial revision: 1\.1"
13104            dotest modules3-17 "cat another/path/test/file1" 'file1'            dotest modules3-17 "cat another/path/test/file1" 'file1'
13105    
13106            dokeep            dokeep
13107            cd ..; rm -r 2            cd ..; rm -rf 2
13108            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
13109                               $CVSROOT_DIRNAME/second-dir                               $CVSROOT_DIRNAME/second-dir
13110            ;;            ;;
# Line 13176  $SPROG commit: Rebuilding administrative Line 13175  $SPROG commit: Rebuilding administrative
13175  "U first-dir/file1  "U first-dir/file1
13176  U first-dir/subdir/file2  U first-dir/subdir/file2
13177  U first-dir/subdir_long/file3"  U first-dir/subdir_long/file3"
13178            rm -r first-dir            rm -rf first-dir
13179    
13180            dotest modules4-11 "${testcvs} -q co some" \            dotest modules4-11 "${testcvs} -q co some" \
13181  "U first-dir/file1  "U first-dir/file1
13182  U first-dir/subdir_long/file3"  U first-dir/subdir_long/file3"
13183            dotest_fail modules4-12 "test -d first-dir/subdir" ''            dotest_fail modules4-12 "test -d first-dir/subdir" ''
13184            dotest modules4-13 "test -d first-dir/subdir_long" ''            dotest modules4-13 "test -d first-dir/subdir_long" ''
13185            rm -r first-dir            rm -rf first-dir
13186    
13187            if $remote; then            if $remote; then
13188              # But remote seems to do it the other way.              # But remote seems to do it the other way.
# Line 13204  U first-dir/subdir_long/file3" Line 13203  U first-dir/subdir_long/file3"
13203              dotest modules4-14-2 "test -d first-dir/subdir" ''              dotest modules4-14-2 "test -d first-dir/subdir" ''
13204              dotest modules4-14-3 "test -d first-dir/subdir_long" ''              dotest modules4-14-3 "test -d first-dir/subdir_long" ''
13205            fi            fi
13206            rm -r first-dir            rm -rf first-dir
13207    
13208            dotest modules4-15 "${testcvs} -q co other" \            dotest modules4-15 "${testcvs} -q co other" \
13209  "U first-dir/file1"  "U first-dir/file1"
13210            dotest_fail modules4-16 "test -d first-dir/subdir" ''            dotest_fail modules4-16 "test -d first-dir/subdir" ''
13211            dotest_fail modules4-17 "test -d first-dir/subdir_long" ''            dotest_fail modules4-17 "test -d first-dir/subdir_long" ''
13212            rm -r first-dir            rm -rf first-dir
13213    
13214            cd ..            cd ..
13215            rm -r 2            rm -r 2
# Line 13240  add-it Line 13239  add-it
13239    
13240            dokeep            dokeep
13241            cd ../../..            cd ../../..
13242            rm -r 1            rm -rf 1
13243            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
13244            ;;            ;;
13245    
# Line 13418  Are you sure you want to release (and de Line 13417  Are you sure you want to release (and de
13417            # (Dec 95).  Probably the exit status should be nonzero,            # (Dec 95).  Probably the exit status should be nonzero,
13418            # however.            # however.
13419            if $remote; then            if $remote; then
13420              dotest modules5-22 "${testcvs} co dirmodule/nonexist" \              dotest modules5-22r "$testcvs co dirmodule/nonexist" \
13421  "${SPROG} checkout: warning: new-born \`dirmodule/nonexist' has disappeared  "$SPROG checkout: nothing known about \`dirmodule/nonexist'
13422  ${SPROG} checkout: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .dirmodule..  $SPROG checkout: Executing ..$CVSROOT_DIRNAME/checkout\.sh. .dirmodule..
13423  checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*  checkout script invoked in $TMPDIR/cvs-serv[0-9a-z]*
13424  args: dirmodule"  args: dirmodule"
13425            else            else
13426              dotest modules5-22 "${testcvs} co dirmodule/nonexist" \              dotest modules5-22 "${testcvs} co dirmodule/nonexist" \
# Line 13570  Are you sure you want to release (and de Line 13569  Are you sure you want to release (and de
13569            # (Dec 95).  Probably the exit status should be nonzero,            # (Dec 95).  Probably the exit status should be nonzero,
13570            # however.            # however.
13571            if $remote; then            if $remote; then
13572              dotest modules5-42 "${testcvs} co -d mydir dirmodule/nonexist" \              dotest modules5-42r "$testcvs co -d mydir dirmodule/nonexist" \
13573  "${SPROG} checkout: warning: new-born \`mydir/nonexist' has disappeared  "$SPROG checkout: nothing known about \`mydir/nonexist'
13574  ${SPROG} checkout: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .mydir..  $SPROG checkout: Executing ..$CVSROOT_DIRNAME/checkout\.sh. .mydir..
13575  checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*  checkout script invoked in $TMPDIR/cvs-serv[0-9a-z]*
13576  args: mydir"  args: mydir"
13577            else            else
13578              dotest modules5-42 "${testcvs} co -d mydir dirmodule/nonexist" \              dotest modules5-42 "${testcvs} co -d mydir dirmodule/nonexist" \
# Line 13680  ${CPROG} \[checkout aborted\]: cannot ex Line 13679  ${CPROG} \[checkout aborted\]: cannot ex
13679            dokeep            dokeep
13680            restore_adm            restore_adm
13681            cd ..            cd ..
13682            rm -r modules6            rm -rf modules6
13683            ;;            ;;
13684    
13685    
# Line 13764  U one/file1" Line 13763  U one/file1"
13763    
13764            dokeep            dokeep
13765            cd ../..            cd ../..
13766            rm -r 1            rm -rf 1
13767            ;;            ;;
13768    
13769    
# Line 13852  U dir5/sdir/file2" Line 13851  U dir5/sdir/file2"
13851            dokeep            dokeep
13852            cd ../..            cd ../..
13853            modify_repo rm -rf $CVSROOT_DIRNAME/$module            modify_repo rm -rf $CVSROOT_DIRNAME/$module
13854            rm -r $module            rm -rf $module
13855            ;;            ;;
13856    
13857    
# Line 15050  U dir2d1/sub/sub2d1/file1" Line 15049  U dir2d1/sub/sub2d1/file1"
15049            # This tests the code in find_dirs which skips Emptydir.            # This tests the code in find_dirs which skips Emptydir.
15050            dotest emptydir-11 "${testcvs} -q -n update -d -P" ''            dotest emptydir-11 "${testcvs} -q -n update -d -P" ''
15051            cd ../..            cd ../..
15052            rm -r edir            rm -rf edir
15053            cd ..            cd ..
15054    
15055            # Now start playing with moda.            # Now start playing with moda.
# Line 15078  ${SPROG} checkout: Updating dir2d1/suba" Line 15077  ${SPROG} checkout: Updating dir2d1/suba"
15077  U dir2d1/sub/sub2d1/file1"  U dir2d1/sub/sub2d1/file1"
15078    
15079            if $remote; then            if $remote; then
15080              dotest emptydir-17 "cat dir2d1/CVS/Repository" "CVSROOT/Emptydir"              dotest emptydir-17r "cat dir2d1/CVS/Repository" "CVSROOT/Emptydir"
15081            else            else
15082              dotest_fail emptydir-17 "test -d dir2d1/CVS"              dotest_fail emptydir-17 "test -d dir2d1/CVS"
15083            fi            fi
15084    
15085            dokeep            dokeep
15086            cd ..            cd ..
15087            rm -r 1 2 3            rm -rf 1 2 3
15088            modify_repo rm -rf $CVSROOT_DIRNAME/mod1 $CVSROOT_DIRNAME/moda            modify_repo rm -rf $CVSROOT_DIRNAME/mod1 $CVSROOT_DIRNAME/moda
15089            # I guess for the moment the convention is going to be            # I guess for the moment the convention is going to be
15090            # that we don't need to remove $CVSROOT_DIRNAME/CVSROOT/Emptydir            # that we don't need to remove $CVSROOT_DIRNAME/CVSROOT/Emptydir
# Line 15149  U ${TESTDIR}/1/file1" Line 15148  U ${TESTDIR}/1/file1"
15148            dotest abspath-2b "cat ${TESTDIR}/1/CVS/Repository" "mod1"            dotest abspath-2b "cat ${TESTDIR}/1/CVS/Repository" "mod1"
15149    
15150            # Done.  Clean up.            # Done.  Clean up.
15151            rm -r $TESTDIR/1            rm -rf $TESTDIR/1
15152    
15153    
15154            # Now try in a subdirectory.  We're not covering any more            # Now try in a subdirectory.  We're not covering any more
# Line 15167  U ${TESTDIR}/1/file1" Line 15166  U ${TESTDIR}/1/file1"
15166            fi            fi
15167            dotest abspath-3.2 "$testcvs -q co -d 1/2 mod1" \            dotest abspath-3.2 "$testcvs -q co -d 1/2 mod1" \
15168  "U 1/2/file1"  "U 1/2/file1"
15169            rm -r 1            rm -rf 1
15170    
15171            # We don't to mess with an existing directory just to traverse it,            # We don't to mess with an existing directory just to traverse it,
15172            # for example by creating a CVS directory, but currently we can't            # for example by creating a CVS directory, but currently we can't
# Line 15289  ${SPROG} \[checkout aborted\]: than the Line 15288  ${SPROG} \[checkout aborted\]: than the
15288            # Finished with all tests.  Cleanup.            # Finished with all tests.  Cleanup.
15289            dokeep            dokeep
15290            cd ../..            cd ../..
15291            rm -r 1 2 3            rm -rf 1 2 3
15292            modify_repo rm -rf $CVSROOT_DIRNAME/mod1 $CVSROOT_DIRNAME/mod2            modify_repo rm -rf $CVSROOT_DIRNAME/mod1 $CVSROOT_DIRNAME/mod2
15293            ;;            ;;
15294    
# Line 15390  ${DOTSTAR} Line 15389  ${DOTSTAR}
15389  ${SPROG} update: Updating top-dir"  ${SPROG} update: Updating top-dir"
15390    
15391            cd ..            cd ..
15392            rm -r 1; mkdir 1; cd 1            rm -rf 1; mkdir 1; cd 1
15393            dotest toplevel-10 "${testcvs} co top-dir" \            dotest toplevel-10 "${testcvs} co top-dir" \
15394  "${SPROG} checkout: Updating top-dir  "${SPROG} checkout: Updating top-dir
15395  U top-dir/file1"  U top-dir/file1"
# Line 15427  ${SPROG} checkout: Updating top-dir" Line 15426  ${SPROG} checkout: Updating top-dir"
15426            dokeep            dokeep
15427            restore_adm            restore_adm
15428            cd ..            cd ..
15429            rm -r 1            rm -rf 1
15430            modify_repo rm -rf $CVSROOT_DIRNAME/top-dir \            modify_repo rm -rf $CVSROOT_DIRNAME/top-dir \
15431                               $CVSROOT_DIRNAME/second-dir                               $CVSROOT_DIRNAME/second-dir
15432            ;;            ;;
# Line 15495  U top-dir/file1" Line 15494  U top-dir/file1"
15494  "${SPROG} update: Updating top-dir"  "${SPROG} update: Updating top-dir"
15495    
15496            cd ..            cd ..
15497            rm -r 1; mkdir 1; cd 1            rm -rf 1; mkdir 1; cd 1
15498            dotest toplevel2-10 "${testcvs} co top-dir" \            dotest toplevel2-10 "${testcvs} co top-dir" \
15499  "${SPROG} checkout: Updating top-dir  "${SPROG} checkout: Updating top-dir
15500  U top-dir/file1"  U top-dir/file1"
# Line 15507  U top-dir/file1" Line 15506  U top-dir/file1"
15506            dokeep            dokeep
15507            cd ..            cd ..
15508            restore_adm            restore_adm
15509            rm -r 1            rm -rf 1
15510            modify_repo rm -rf $CVSROOT_DIRNAME/top-dir \            modify_repo rm -rf $CVSROOT_DIRNAME/top-dir \
15511                               $CVSROOT_DIRNAME/second-dir                               $CVSROOT_DIRNAME/second-dir
15512            ;;            ;;
# Line 16135  initial revision: 1\.1" Line 16134  initial revision: 1\.1"
16134            if $remote; then            if $remote; then
16135              dotest errmsg1-168r "${testcvs} -q update" \              dotest errmsg1-168r "${testcvs} -q update" \
16136  "${SPROG} update: \`foo' is no longer in the repository  "${SPROG} update: \`foo' is no longer in the repository
16137  $CPROG update: unable to remove \./foo: Permission denied" \  $CPROG update: unable to remove foo: Permission denied" \
16138  "${SPROG} update: \`foo' is no longer in the repository"  "${SPROG} update: \`foo' is no longer in the repository"
16139            else            else
16140              dotest errmsg1-168 "${testcvs} -q update" \              dotest errmsg1-168 "${testcvs} -q update" \
# Line 16352  initial revision: 1\.1" Line 16351  initial revision: 1\.1"
16351    
16352              dokeep              dokeep
16353              cd ..              cd ..
16354              rm -r close-stdout              rm -rf close-stdout
16355              modify_repo rm -rf $CVSROOT_DIRNAME/closeout              modify_repo rm -rf $CVSROOT_DIRNAME/closeout
16356            else            else
16357              skip close-stdout '/dev/full is not available'              skip close-stdout '/dev/full is not available'

Legend:
Removed from v.1.1095.4.19  
changed lines
  Added in v.1.1095.4.20

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26