/[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.15 by dprice, Wed Nov 30 19:58:46 2005 UTC revision 1.1095.4.16 by dprice, Wed Nov 30 20:25:39 2005 UTC
# Line 9078  modify-on-br1 Line 9078  modify-on-br1
9078            dokeep            dokeep
9079            cd ..            cd ..
9080            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir
9081            rm -r first-dir            rm -rf first-dir
9082            ;;            ;;
9083    
9084    
# Line 9276  Use the following command to help the me Line 9276  Use the following command to help the me
9276                  dotest import-113 \                  dotest import-113 \
9277  "$testcvs -q co -jjunk-1_0 -jjunk-2_0 first-dir" \  "$testcvs -q co -jjunk-1_0 -jjunk-2_0 first-dir" \
9278  "$SPROG checkout: file first-dir/imported-f1 does not exist, but is present in revision junk-2_0  "$SPROG checkout: file first-dir/imported-f1 does not exist, but is present in revision junk-2_0
9279  Merging differences between 1\.1\.1\.1 and 1\.1\.1\.2 into \`imported-f2'  Merging differences between 1\.1\.1\.1 and 1\.1\.1\.2 into \`first-dir/imported-f2'
9280  $CPROG update: conflicts during merge  $CPROG checkout: conflicts during merge
9281  first-dir/imported-f3 already contains the differences between 1\.1\.1\.1 and 1\.1\.1\.2  C first-dir/imported-f2"
 first-dir/imported-f4 already contains the differences between 1\.1\.1\.1 and 1\.1\.1\.3"  
9282    
9283                  cd first-dir                  cd first-dir
9284    
# Line 9407  add Line 9406  add
9406    
9407            dokeep            dokeep
9408            cd ../..            cd ../..
9409            rm -r 1            rm -rf 1
9410            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \            modify_repo rm -rf $CVSROOT_DIRNAME/first-dir \
9411                               $CVSROOT_DIRNAME/second-dir                               $CVSROOT_DIRNAME/second-dir
9412            ;;            ;;

Legend:
Removed from v.1.1095.4.15  
changed lines
  Added in v.1.1095.4.16

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