/[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.13 by dprice, Wed Nov 30 05:04:14 2005 UTC revision 1.1095.4.14 by dprice, Wed Nov 30 15:12:30 2005 UTC
# Line 7797  dir1:" Line 7797  dir1:"
7797            # we should release it instead.  We do it a few other places            # we should release it instead.  We do it a few other places
7798            # below as well.            # below as well.
7799            rm -rf dir1            rm -rf dir1
7800            dotest branches2-15 "${testcvs} update -d -j b1 dir1" \            dotest branches2-15 "$testcvs update -d -j b1 dir1" \
7801  "${SPROG} update: Updating dir1  "$SPROG update: Updating dir1
7802  U dir1/file3"  $SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`dir1/file3'\."
7803    
7804            # FIXCVS: The `No revision control file' stuff seems to be            # FIXCVS: The `No revision control file' stuff seems to be
7805            # CVS's way of telling us that we're adding the file on a            # CVS's way of telling us that we're adding the file on a
7806            # branch, and the file is not on that branch yet.  This            # branch, and the file is not on that branch yet.  This
# Line 7852  File: file3                    Status: Up-to-da Line 7853  File: file3                    Status: Up-to-da
7853     Sticky Date:         (none)     Sticky Date:         (none)
7854     Sticky Options:      (none)"     Sticky Options:      (none)"
7855    
7856            rm -r dir1            rm -rf dir1
7857            dotest branches2-21 "${testcvs} update -d -P -j b1 dir1" \            dotest branches2-21 "$testcvs update -d -P -j b1 dir1" \
7858  "${SPROG} update: Updating dir1  "$SPROG update: Updating dir1
7859  U dir1/file3"  $SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`dir1/file3'\."
7860            dotest branches2-22 "${testcvs} -q status" \            dotest branches2-22 "${testcvs} -q status" \
7861  "===================================================================  "===================================================================
7862  File: file1             Status: Up-to-date  File: file1             Status: Up-to-date
# Line 7878  File: file3                    Status: Locally Line 7879  File: file3                    Status: Locally
7879     Sticky Options:      (none)"     Sticky Options:      (none)"
7880    
7881            cd ../..            cd ../..
7882            rm -r b1 b2            rm -rf b1 b2
7883    
7884            # Check out branch b1 twice.  Crate a new directory in one            # Check out branch b1 twice.  Crate a new directory in one
7885            # working directory, then do a cvs update in the other            # working directory, then do a cvs update in the other
# Line 7927  File: file4                    Status: Up-to-da Line 7928  File: file4                    Status: Up-to-da
7928    
7929            # Test update -A on a subdirectory            # Test update -A on a subdirectory
7930            cd ..            cd ..
7931            rm -r dir2            rm -rf dir2
7932            dotest branches2-31 "${testcvs} update -A -d dir2" \            dotest branches2-31 "${testcvs} update -A -d dir2" \
7933  "${SPROG} update: Updating dir2"  "${SPROG} update: Updating dir2"
7934            cd dir2            cd dir2
# Line 7975  first-dir/dir2: Line 7976  first-dir/dir2:
7976            dokeep            dokeep
7977            cd ../../..            cd ../../..
7978            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
7979            rm -r trunk b1a b1b            rm -rf trunk b1a b1b
7980            ;;            ;;
7981    
7982    
# Line 8184  T file2" Line 8185  T file2"
8185    
8186            dokeep            dokeep
8187            cd ../..            cd ../..
8188            rm -r 1 2            rm -rf 1 2
8189            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
8190            ;;            ;;
8191    

Legend:
Removed from v.1.1095.4.13  
changed lines
  Added in v.1.1095.4.14

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