/[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.22 by dprice, Thu Dec 1 15:30:41 2005 UTC revision 1.1095.4.23 by dprice, Thu Dec 1 18:45:16 2005 UTC
# Line 17524  U m" Line 17524  U m"
17524  new revision: 1\.2; previous revision: 1\.1"  new revision: 1\.2; previous revision: 1\.1"
17525            cd ../..            cd ../..
17526            cd 2/x            cd 2/x
17527            dotest unedit-without-baserev-13 "${testcvs} -q update" \  test -f CVS/Base/.#m.1.1.1.1 || exit
17528  "RCS file: ${CVSROOT_DIRNAME}/x/m,v            dotest unedit-without-baserev-13 "$testcvs -q update" \
17529  retrieving revision 1\.1\.1\.1  "Merging differences between 1\.1\.1\.1 and 1\.2 into \`m'
17530  retrieving revision 1\.2  $CPROG update: conflicts during merge
 Merging differences between 1\.1\.1\.1 and 1\.2 into m  
 rcsmerge: warning: conflicts during merge  
 ${SPROG} update: conflicts found in m  
17531  C m"  C m"
17532    test -f CVS/Base/.#m.1.2 || exit
17533            rm CVS/Baserev            rm CVS/Baserev
17534            dotest unedit-without-baserev-14 "echo yes |${testcvs} unedit m" \            dotest unedit-without-baserev-14 "echo yes |${testcvs} unedit m" \
17535  "m has been modified; revert changes${QUESTION} ${CPROG} unedit: m not mentioned in CVS/Baserev  "m has been modified; revert changes${QUESTION} ${CPROG} unedit: m not mentioned in CVS/Baserev
17536  ${CPROG} unedit: run update to complete the unedit"  ${CPROG} unedit: run update to complete the unedit"
17537    test -f CVS/Base/.#m.1.2 || exit
17538            dotest unedit-without-baserev-15 "${testcvs} -q update" \            dotest unedit-without-baserev-15 "${testcvs} -q update" \
17539  "$SPROG update: warning: \`m' was lost  "$SPROG update: warning: \`m' was lost
17540  U m"  U m"
17541    test -f CVS/Base/.#m.1.2 || exit
17542            # The following tests are kind of degenerate compared with            # The following tests are kind of degenerate compared with
17543            # watch4-16 through watch4-18 but might as well make sure that            # watch4-16 through watch4-18 but might as well make sure that
17544            # nothing seriously wrong has happened to the working directory.            # nothing seriously wrong has happened to the working directory.
# Line 17550  U m" Line 17550  U m"
17550            dokeep            dokeep
17551            cd ../..            cd ../..
17552            rm -rf 1            rm -rf 1
17553            rm -r 2            rm -rf 2
17554            modify_repo rm -rf $CVSROOT_DIRNAME/$module            modify_repo rm -rf $CVSROOT_DIRNAME/$module
17555            ;;            ;;
17556    
# Line 17744  T file1' Line 17744  T file1'
17744  new revision: 1\.1\.2\.2; previous revision: 1\.1\.2\.1"  new revision: 1\.1\.2\.2; previous revision: 1\.1\.2\.1"
17745            dotest ignore-on-branch-6 "$testcvs -q up -rbranch2" \            dotest ignore-on-branch-6 "$testcvs -q up -rbranch2" \
17746  "${SPROG} update: \`file2' is no longer in the repository"  "${SPROG} update: \`file2' is no longer in the repository"
17747            dotest ignore-on-branch-7 "$testcvs -q up -jbranch" 'U file2'            dotest ignore-on-branch-7 "$testcvs -q up -jbranch" \
17748    "$SPROG update: scheduling addition from revision 1\.1\.2\.2 of \`file2'\."
17749    
17750            dokeep            dokeep
17751            cd ../..            cd ../..
# Line 17819  File: binfile                  Status: Up-to-da Line 17820  File: binfile                  Status: Up-to-da
17820            # also used when operating on files instead of whole            # also used when operating on files instead of whole
17821            # directories            # directories
17822            cd ../..            cd ../..
17823            rm -r 2a            rm -rf 2a
17824            mkdir 3; cd 3            mkdir 3; cd 3
17825            dotest binfiles-5.5b0 "${testcvs} -q co first-dir/binfile" \            dotest binfiles-5.5b0 "${testcvs} -q co first-dir/binfile" \
17826  'U first-dir/binfile'  'U first-dir/binfile'
# Line 17835  File: binfile                  Status: Up-to-da Line 17836  File: binfile                  Status: Up-to-da
17836     Sticky Date:         (none)     Sticky Date:         (none)
17837     Sticky Options:      -kb"     Sticky Options:      -kb"
17838            cd ../..            cd ../..
17839            rm -r 3            rm -rf 3
17840            # test that "-kk" does not override "-kb"            # test that "-kk" does not override "-kb"
17841            mkdir 3; cd 3            mkdir 3; cd 3
17842            dotest binfiles-5.5b0 "${testcvs} -q co -kk first-dir/binfile" \            dotest binfiles-5.5b2 "${testcvs} -q co -kk first-dir/binfile" \
17843  'U first-dir/binfile'  'U first-dir/binfile'
17844            cd first-dir            cd first-dir
17845            dotest binfiles-5.5b1 "${testcvs} status binfile" \            dotest binfiles-5.5b3 "${testcvs} status binfile" \
17846  "===================================================================  "===================================================================
17847  File: binfile           Status: Up-to-date  File: binfile           Status: Up-to-date
17848    
# Line 17852  File: binfile                  Status: Up-to-da Line 17853  File: binfile                  Status: Up-to-da
17853     Sticky Date:         (none)     Sticky Date:         (none)
17854     Sticky Options:      -kb"     Sticky Options:      -kb"
17855            cd ../..            cd ../..
17856            rm -r 3            rm -rf 3
17857            cd 2/first-dir            cd 2/first-dir
17858    
17859            cp ../../1/binfile2.dat binfile            cp ../../1/binfile2.dat binfile
# Line 17914  File: binfile                  Status: Up-to-da Line 17915  File: binfile                  Status: Up-to-da
17915     Sticky Date:         (none)     Sticky Date:         (none)
17916     Sticky Options:      -kb"     Sticky Options:      -kb"
17917            cd ../..            cd ../..
17918            rm -r 3            rm -rf 3
17919    
17920            cd 2/first-dir            cd 2/first-dir
17921            echo 'this file is $''RCSfile$' >binfile            echo 'this file is $''RCSfile$' >binfile
# Line 18033  total revisions: 1 Line 18034  total revisions: 1
18034    
18035            # Check that the contents were right.  This isn't the hard case            # Check that the contents were right.  This isn't the hard case
18036            # (in which RCS_delete_revs does a diff), but might as well.            # (in which RCS_delete_revs does a diff), but might as well.
18037            dotest binfiles-o4 "${testcvs} -q update binfile" "U binfile"            if $remote; then
18038            dotest binfiles-o5 "cmp binfile ../../1/binfile.dat" ""              dotest_fail binfiles-o4r "$testcvs -q update binfile" \
18039    "$SPROG \[update aborted\]: could not find desired version 1\.5 in $CVSROOT_DIRNAME/first-dir/binfile,v"
18040              else
18041                # FIXCVS: Local mode silently overwrites what it thinks is
18042                # revision 1.5 of binfile with revision 1.3 of binfile when
18043                # the later revisions disappear.  This doesn't sound right.
18044                # Either way, the behavior should match.
18045                dotest binfiles-o4 "$testcvs -q update binfile" "U binfile"
18046                dotest binfiles-o5 "cmp binfile ../../1/binfile.dat"
18047              fi
18048    
18049            dokeep            dokeep
18050            cd ../..            cd ../..
18051            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
18052            rm -r 1 2            rm -rf 1 2
18053            ;;            ;;
18054    
18055    
# Line 18134  new revision: 1\.2; previous revision: 1 Line 18144  new revision: 1\.2; previous revision: 1
18144            cp ../binfile3 brmod-wdmod            cp ../binfile3 brmod-wdmod
18145    
18146            dotest binfiles2-8 "${testcvs} -q update -j br" \            dotest binfiles2-8 "${testcvs} -q update -j br" \
18147  "U binfile\.dat  "$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`binfile.dat'\.
18148  U brmod  U brmod
18149  ${SPROG} update: nonmergeable file needs merge  ${SPROG} update: nonmergeable file needs merge
18150  ${SPROG} update: revision 1.1.2.1 from repository is now in brmod-trmod  ${SPROG} update: revision 1.1.2.1 from repository is now in brmod-trmod

Legend:
Removed from v.1.1095.4.22  
changed lines
  Added in v.1.1095.4.23

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