/[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.25 by dprice, Fri Dec 2 17:28:36 2005 UTC revision 1.1095.4.26 by dprice, Fri Dec 2 21:12:44 2005 UTC
# Line 23255  new revision: 1\.6; previous revision: 1 Line 23255  new revision: 1\.6; previous revision: 1
23255            #            #
23256            # Feel free to imagine the horrific scream of despair            # Feel free to imagine the horrific scream of despair
23257            cd ../../1/first-dir            cd ../../1/first-dir
23258            dotest backuprecover-15 "${testcvs} update" \            if $remote; then
23259  "${SPROG} update: Updating .              # FIXCVS
23260                # See the note above about lost data and a few other comments in
23261                # other tests.  At least with base files, no data is lost, but this
23262                # is a side effect of sending diffs against bases and should
23263                # probably be caught explicitly, such that it would also be caught
23264                # in local mode.
23265                dotest_fail backuprecover-15r "$testcvs update" \
23266    "$SPROG update: Updating .
23267    $SPROG \[update aborted\]: could not find desired version 1\.5 in $CVSROOT_DIRNAME/first-dir/file1,v"
23268              else
23269                dotest backuprecover-15 "$testcvs update" \
23270    "$SPROG update: Updating .
23271  U file1  U file1
23272  ${SPROG} update: Updating dir  $SPROG update: Updating dir
23273  U dir/file2"  U dir/file2"
23274              fi
23275    
23276            # Developer 3 tries the same thing (he has an office)            # Developer 3 tries the same thing (he has an office)
23277            # but fails without losing data since all of his files have            # but fails without losing data since all of his files have
# Line 23310  new revision: 1\.4; previous revision: 1 Line 23322  new revision: 1\.4; previous revision: 1
23322            cd ../../4/first-dir            cd ../../4/first-dir
23323            dotest backuprecover-20 "${testcvs} update" \            dotest backuprecover-20 "${testcvs} update" \
23324  "${SPROG} update: Updating \.  "${SPROG} update: Updating \.
23325  RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v  Merging differences between 1\.3 and 1\.4 into \`file1'
23326  retrieving revision 1\.3  $CPROG update: conflicts during merge
 retrieving revision 1\.4  
 Merging differences between 1\.3 and 1\.4 into file1  
 rcsmerge: warning: conflicts during merge  
 ${SPROG} update: conflicts found in file1  
23327  C file1  C file1
23328  ${SPROG} update: Updating dir  $SPROG update: Updating dir
23329  RCS file: ${CVSROOT_DIRNAME}/first-dir/dir/file2,v  Merging differences between 1\.3 and 1\.4 into \`dir/file2'
23330  retrieving revision 1\.3  $CPROG update: conflicts during merge
 retrieving revision 1\.4  
 Merging differences between 1\.3 and 1\.4 into file2  
 rcsmerge: warning: conflicts during merge  
 ${SPROG} update: conflicts found in dir/file2  
23331  C dir/file2"  C dir/file2"
23332            sed -e \            sed -e \
23333  "/^<<<<<<</,/^=======/d  "/^<<<<<<</,/^=======/d
# Line 23338  new revision: 1\.5; previous revision: 1 Line 23342  new revision: 1\.5; previous revision: 1
23342    
23343            # go back and commit developer 2's stuff to prove it can still be done            # go back and commit developer 2's stuff to prove it can still be done
23344            cd ../../2/first-dir            cd ../../2/first-dir
23345            dotest backuprecover-22 "${testcvs} -Q update" \            dotest backuprecover-22 "$testcvs -Q update"
 "RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v  
 retrieving revision 1\.2  
 retrieving revision 1\.4  
 Merging differences between 1\.2 and 1\.4 into file1  
 RCS file: ${CVSROOT_DIRNAME}/first-dir/dir/file2,v  
 retrieving revision 1\.2  
 retrieving revision 1\.5  
 Merging differences between 1\.2 and 1\.5 into file2"  
23346            dotest backuprecover-23 "${testcvs} -q ci -mtest" \            dotest backuprecover-23 "${testcvs} -q ci -mtest" \
23347  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
23348  new revision: 1\.5; previous revision: 1\.4  new revision: 1\.5; previous revision: 1\.4
# Line 23355  new revision: 1\.6; previous revision: 1 Line 23351  new revision: 1\.6; previous revision: 1
23351    
23352            # and restore the data to developer 1            # and restore the data to developer 1
23353            cd ../../1/first-dir            cd ../../1/first-dir
23354            dotest backuprecover-24 "${testcvs} -Q update" ''            dotest backuprecover-24 "$testcvs -Q update"
23355    
23356            dokeep            dokeep
23357            cd ../../..            cd ../../..
23358            rm -r backuprecover            rm -rf backuprecover
23359            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
23360            ;;            ;;
23361    
# Line 23975  ${SPROG} update: Updating second-dir" Line 23971  ${SPROG} update: Updating second-dir"
23971    
23972            dokeep            dokeep
23973            cd ..            cd ..
23974            rm -r 1            rm -rf 1
23975            # quiet down this one as it will be noisy in proxy mode            # quiet down this one as it will be noisy in proxy mode
23976            modify_repo chmod u+rwx $CVSROOT_DIRNAME/first-dir 2>/dev/null            modify_repo chmod u+rwx $CVSROOT_DIRNAME/first-dir 2>/dev/null
23977            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
# Line 24091  U first-dir/kw" Line 24087  U first-dir/kw"
24087    
24088            dokeep            dokeep
24089            cd ../..            cd ../..
24090            rm -r 1 2            rm -rf 1 2
24091            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
24092            ;;            ;;
24093    
# Line 24402  U file1" "U file1" Line 24398  U file1" "U file1"
24398            dokeep            dokeep
24399            restore_adm            restore_adm
24400            cd ../..            cd ../..
24401            rm -r 1            rm -rf 1
24402            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
24403            ;;            ;;
24404    
# Line 24583  xx "'\$'"Log"'\$' Line 24579  xx "'\$'"Log"'\$'
24579            dotest keyword-19 "${testcvs} -q tag tag1" "T file1"            dotest keyword-19 "${testcvs} -q tag tag1" "T file1"
24580            echo "change" >> file1            echo "change" >> file1
24581            dotest keyword-20 "$testcvs -Q ci -m mod2 file1"            dotest keyword-20 "$testcvs -Q ci -m mod2 file1"
24582            # FIXCVS - These unpatchable files are happening because the tag            dotest keyword-21 "$testcvs -q update -r tag1" "U file1" \
24583            # associated with the current base version of the file in the  "U file1"
           # sandbox is not available in these cases.  See the note in the  
           # patch_file function in update.c.  
           dotest keyword-21 "${testcvs} -q update -r tag1" "U file1" \  
 "P file1  
 ${CPROG} update: checksum failure after patch to \./file1; will refetch  
 ${CPROG} client: refetching unpatchable files  
 $SPROG update: warning: \`file1' was lost  
 U file1"  
24584    
24585            dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$'            dotest keyword-22 "cat file1" '\$'"Name: tag1 "'\$'
24586    
24587            if $remote; then            dotest keyword-23 "$testcvs update -A file1" "U file1"
             # Like serverpatch-8.  Not sure there is anything much we  
             # can or should do about this.  
             dotest keyword-23r "${testcvs} update -A file1" "P file1  
 ${CPROG} update: checksum failure after patch to \./file1; will refetch  
 ${CPROG} client: refetching unpatchable files  
 $SPROG update: warning: \`file1' was lost  
 U file1"  
           else  
             dotest keyword-23 "${testcvs} update -A file1" "[UP] file1"  
           fi  
24588            dotest keyword-24 "cat file1" '\$'"Name:  "'\$'"            dotest keyword-24 "cat file1" '\$'"Name:  "'\$'"
24589  change"  change"
24590    
24591            dokeep            dokeep
24592            cd ../..            cd ../..
24593            rm -r 1            rm -rf 1
24594            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
24595            ;;            ;;
24596    

Legend:
Removed from v.1.1095.4.25  
changed lines
  Added in v.1.1095.4.26

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