tests/apply-hunks.sh

   1 #!/usr/bin/env bash
   2 set -ev
   3
   4 rm -rf temp0 temp1 temp2
   5
   6 # step 1
   7 mkdir temp0
   8 cd temp0
   9 darcs init --darcs-2
  10 echo m1 > foo
  11 darcs add foo
  12 darcs record -a -m m1 -A moi --ignore-times
  13 cd ..
  14
  15 # step 2
  16 darcs get temp0 temp1
  17 cd temp1
  18 echo a1 > foo
  19 darcs record foo -a -m a1 -A moi --ignore-times
  20 cd ..
  21
  22
  23 # step 3
  24 cd temp0
  25 echo m2 > foo
  26 darcs record -a -m m2 -A moi --ignore-times
  27 cd ..
  28
  29
  30 # step 4
  31 cd temp1
  32 darcs pull -a
  33 echo m2-a1 > foo
  34 darcs record -a -m 'Fix conflict m2-a1' -A moi --ignore-times
  35 cd ..
  36
  37 #step 5
  38 cd temp0
  39 echo m3 > foo
  40 darcs record -a -m m3 -A moi --ignore-times
  41 cd ..
  42
  43 #step 6
  44 darcs get temp0 temp2
  45 cd temp2
  46 echo b1 > foo
  47 darcs record -a -m b1 -A moi --ignore-times
  48 cd ..
  49
  50 #step 7
  51 cd temp0
  52 echo m4 > foo
  53 darcs record -a -m m4 -A moi --ignore-times
  54 cd ..
  55
  56 #step 8
  57 cd temp1
  58 darcs pull -a
  59 echo m2-a1-m4 > foo
  60 echo y | darcs mark-conflicts
  61 cd ..
  62
  63 rm -rf temp0 temp1 temp2