/[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.23 by dprice, Thu Dec 1 18:45:16 2005 UTC revision 1.1095.4.24 by dprice, Thu Dec 1 20:23:46 2005 UTC
# Line 18143  new revision: 1\.1\.2\.1; previous revis Line 18143  new revision: 1\.1\.2\.1; previous revis
18143  new revision: 1\.2; previous revision: 1\.1"  new revision: 1\.2; previous revision: 1\.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  "$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`binfile.dat'\.  "$SPROG update: scheduling addition from revision 1\.1\.2\.1 of \`binfile.dat'\.
18148  U brmod  $SPROG update: Replacing \`brmod' with contents of revision 1\.1\.2\.1\.
18149  ${SPROG} update: nonmergeable file needs merge  M brmod
18150  ${SPROG} update: revision 1.1.2.1 from repository is now in brmod-trmod  $SPROG update: Nonmergeable file needs merge\.
18151  ${SPROG} update: file from working directory is now in .#brmod-trmod.1.2  $SPROG update: Replacing \`brmod-trmod' with contents of revision 1\.1\.2\.1\.
18152    $SPROG update: File from working directory is now in \`\.#brmod-trmod\.1\.2'\.
18153  C brmod-trmod  C brmod-trmod
18154  M brmod-wdmod  M brmod-wdmod
18155  ${SPROG} update: nonmergeable file needs merge  $SPROG update: Nonmergeable file needs merge\.
18156  ${SPROG} update: revision 1.1.2.1 from repository is now in brmod-wdmod  $SPROG update: Replacing \`brmod-wdmod' with contents of revision 1\.1\.2\.1\.
18157  ${SPROG} update: file from working directory is now in .#brmod-wdmod.1.1  $SPROG update: File from working directory is now in \`\.#brmod-wdmod\.1\.1'\.
18158  C brmod-wdmod"  C brmod-wdmod"
18159    
18160            dotest binfiles2-9 "cmp ../binfile binfile.dat"            dotest binfiles2-9 "cmp ../binfile binfile.dat"
# Line 18164  C brmod-wdmod" Line 18165  C brmod-wdmod"
18165            dotest binfiles2-9a-brmod-wdmod "cmp ../binfile3 .#brmod-wdmod.1.1"            dotest binfiles2-9a-brmod-wdmod "cmp ../binfile3 .#brmod-wdmod.1.1"
18166    
18167            # Test that everything was properly scheduled.            # Test that everything was properly scheduled.
18168            dotest binfiles2-10 "${testcvs} -q ci -m checkin" \            dotest_fail binfiles2-10a "${testcvs} -q ci -m checkin" \
18169    "$SPROG commit: file \`brmod-trmod' had a conflict and has not been modified
18170    $SPROG commit: file \`brmod-wdmod' had a conflict and has not been modified
18171    $SPROG \[commit aborted\]: correct above errors first!"
18172    
18173              touch brmod-trmod brmod-wdmod
18174              dotest binfiles2-10b "${testcvs} -q ci -m checkin" \
18175  "$CVSROOT_DIRNAME/first-dir/binfile\.dat,v  <--  binfile\.dat  "$CVSROOT_DIRNAME/first-dir/binfile\.dat,v  <--  binfile\.dat
18176  new revision: 1\.2; previous revision: 1\.1  new revision: 1\.2; previous revision: 1\.1
18177  $CVSROOT_DIRNAME/first-dir/brmod,v  <--  brmod  $CVSROOT_DIRNAME/first-dir/brmod,v  <--  brmod
# Line 18207  checkin Line 18214  checkin
18214            dokeep            dokeep
18215            cd ../..            cd ../..
18216            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
18217            rm -r 1            rm -rf 1
18218            ;;            ;;
18219    
18220    
# Line 18249  D" Line 18256  D"
18256            # in checkaddfile()); should also test the case in which            # in checkaddfile()); should also test the case in which
18257            # we are changing it from one non-default value to another.            # we are changing it from one non-default value to another.
18258            dotest binfiles3-7 "$testcvs -q ci -m readd-it" \            dotest binfiles3-7 "$testcvs -q ci -m readd-it" \
18259  "$SPROG commit: changing keyword expansion mode to -kb  "$SPROG commit: changing keyword expansion mode of \`file1' from \`-kkv' to \`-kb'
18260  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1  $CVSROOT_DIRNAME/first-dir/file1,v  <--  file1
18261  new revision: 1\.3; previous revision: 1\.2"  new revision: 1\.3; previous revision: 1\.2"
18262            dotest binfiles3-8 "${testcvs} -q log -h -N file1" "            dotest binfiles3-8 "${testcvs} -q log -h -N file1" "
# Line 18287  done" Line 18294  done"
18294    
18295            dokeep            dokeep
18296            cd ../..            cd ../..
18297            rm -r 1            rm -rf 1
18298            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
18299            ;;            ;;
18300    

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

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