tests/steve_and_monica_rollback.sh

   1 #!/bin/bash
   2
   3 #  Issue578: A conflict rollback case for Darcs2
   4
   5 set -ev
   6
   7 rm -rf tmp_steve tmp_monica
   8
   9 mkdir tmp_steve
  10 mkdir tmp_monica
  11
  12 cd tmp_steve
  13 darcs init  --darcs-2
  14 echo A >foo
  15 darcs add foo
  16 darcs record -Asteve -am 'Anote'
  17
  18 echo B >foo
  19 darcs record -Asteve -am 'Bnote'
  20
  21 # Show the history as Steve sees it.
  22 darcs changes -s
  23 echo "######"
  24
  25 cd ../tmp_monica
  26 darcs init --darcs-2
  27 echo A>foo
  28 darcs add foo
  29 echo Z>bar
  30 darcs add bar
  31 darcs record -Amonica -am 'AZnote'
  32 darcs pull -a ../tmp_steve
  33 darcs changes
  34 echo "######"
  35 darcs rollback -a -m newpatch -A me --match 'exact Anote'
  36
  37 # previous failure result: darcs failed:  cannot roll back a 'rollback' patch.
  38