tests/three_way_conflict.sh

   1 #!/usr/bin/env bash
   2 set -ev
   3
   4 rm -rf temp1 temp2 temp3
   5 mkdir -p temp1 temp2 temp3
   6 cd temp1
   7 darcs init
   8 cd ../temp2
   9 darcs init
  10 cd ../temp3
  11 darcs init
  12
  13 touch foo
  14 darcs add foo
  15 darcs record -a -A author -m add
  16 darcs push -a ../temp2
  17 darcs push -a ../temp1
  18
  19 echo A > foo
  20 darcs record -a -A author -m AA
  21 cd ../temp2
  22 echo B > foo
  23 darcs record -a -A author -m BB
  24 cd ../temp1
  25 echo C > foo
  26 darcs record -a -A author -m CC
  27
  28 darcs pull -a ../temp2
  29 darcs pull -a ../temp3
  30
  31 cd ../temp2
  32 darcs pull -a ../temp3
  33 darcs pull -a ../temp1
  34 rm -rf temp1 temp2 temp3