tests/hidden_conflict.sh

   1 #!/bin/sh
   2
   3 set -ev
   4
   5 rm -rf temp1 temp2
   6 mkdir temp1
   7 cd temp1
   8 darcs init --darcs-2
   9 echo first > a
  10 darcs add a
  11 darcs record -am 'first'
  12 cd ..
  13 darcs get temp1 temp2
  14
  15 cd temp1
  16 echo second > a
  17 darcs record -am 'first to second'
  18 echo first > a
  19 darcs record -am 'second back to first'
  20 cd ..
  21
  22 cd temp2
  23 echo third > a
  24 darcs record -am 'first to third'
  25 cd ..
  26
  27 cd temp1
  28 darcs pull -a ../temp2 | grep conflict
  29 grep third a
  30 cd ..
  31
  32 rm -rf temp1 temp2