/[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.11 by dprice, Wed Nov 30 04:01:34 2005 UTC revision 1.1095.4.12 by dprice, Wed Nov 30 04:14:38 2005 UTC
# Line 5389  new revision: 1\.2; previous revision: 1 Line 5389  new revision: 1\.2; previous revision: 1
5389                  echo force a conflict >>tfile                  echo force a conflict >>tfile
5390                  dotest status-init-7 "$testcvs -q up" \                  dotest status-init-7 "$testcvs -q up" \
5391  "Merging differences between 1\.1 and 1\.2 into \`tfile'  "Merging differences between 1\.1 and 1\.2 into \`tfile'
5392  cvs update: conflicts during merge"  $CPROG update: conflicts during merge
5393    M tfile"
5394    
5395                  # Now note our status                  # Now note our status
5396                  dotest status-1 "${testcvs} status tfile" \                  dotest status-1 "${testcvs} status tfile" \
# Line 5606  File: foo                      Status: Up-to-da Line 5607  File: foo                      Status: Up-to-da
5607          TRDIFF                          (branch: 1\.1\.1)"          TRDIFF                          (branch: 1\.1\.1)"
5608    
5609                  cd ..                  cd ..
5610                  rm -r trdiff                  rm -rf trdiff
5611    
5612                  dotest rdiff-8 \                  dotest rdiff-8 \
5613                    "${testcvs} rdiff -r T1 -r local-v0 trdiff" \                    "${testcvs} rdiff -r T1 -r local-v0 trdiff" \
# Line 6243  R file2 Line 6244  R file2
6244  A file3"  A file3"
6245    
6246                  # commit                  # commit
6247                  dotest deatch-89 "$testcvs -q ci -m test" \                  dotest death-89 "$testcvs -q ci -m test" \
6248  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1  "$CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
6249  new revision: 1\.4; previous revision: 1\.3  new revision: 1\.4; previous revision: 1\.3
6250  $CVSROOT_DIRNAME/first-dir/file2,v  <--  file2  $CVSROOT_DIRNAME/first-dir/file2,v  <--  file2
# Line 6257  new revision: 1\.2; previous revision: 1 Line 6258  new revision: 1\.2; previous revision: 1
6258  'U first-dir/file1  'U first-dir/file1
6259  U first-dir/file3'  U first-dir/file3'
6260                  cd ..                  cd ..
6261                  rm -r 2                  rm -rf 2
6262                  cd first-dir                  cd first-dir
6263    
6264                  # remove first file.                  # remove first file.
# Line 6299  $SPROG update: file file3 exists, but ha Line 6300  $SPROG update: file file3 exists, but ha
6300    
6301                  dokeep                  dokeep
6302                  cd ..                  cd ..
6303                  rm -r first-dir                  rm -rf first-dir
6304                  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir                  modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
6305                  ;;                  ;;
6306    
# Line 6642  C file4" Line 6643  C file4"
6643    
6644            dokeep            dokeep
6645            cd ..            cd ..
6646            rm -r first-dir            rm -rf first-dir
6647            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
6648            ;;            ;;
6649    

Legend:
Removed from v.1.1095.4.11  
changed lines
  Added in v.1.1095.4.12

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