Follow upstream changes -- rest
[git-darcs-import.git] / tests / issue436.sh
blob145fde8b7c7a3ed352ea5d832b6016a789e49257
1 #!/usr/bin/env bash
2 set -ev
4 rm -rf temp1 temp2
5 mkdir temp1
6 cd temp1
7 # this test fails in the darcs 1 format
8 darcs init --darcs-2
9 echo A > f
10 darcs add f
11 darcs record --ignore-times -a -m A
12 cd ..
14 darcs get temp1 temp2
16 cd temp1
17 echo C > f
18 darcs record --ignore-times -a -m A-C
19 cd ..
21 cd temp2
22 echo B > f
23 darcs record --ignore-times -a -m A-B
24 echo A > f
25 darcs record --ignore-times -a -m B-A
26 (darcs push -a || :) 2> push-result
27 grep "Refusing to apply" push-result
28 cd ..
30 rm -rf temp1 temp2