Follow upstream changes -- Bytestring updates
[git-darcs-import.git] / bugs / issue27.sh
blobaed274969df27bbfc78b93f28a3e52cf4ac23756
1 #!/bin/sh
3 set -ev
5 rm -rf temp1 temp2
6 mkdir temp1 temp2
7 cd temp1
8 darcs init
9 echo first > a
10 darcs add a
11 darcs record --pipe --all --patch-name=first <<EOF
12 Thu Sep 18 22:37:06 MSD 2008
13 author
14 EOF
16 echo first > b
17 darcs add b
18 darcs record --pipe --all --patch-name=first <<EOF
19 Thu Sep 18 22:37:06 MSD 2008
20 author
21 EOF
23 cd ../temp2
24 darcs init
25 darcs pull --all --dont-allow-conflicts ../temp1
26 echo second >> a
27 darcs record --pipe --all --patch-name=second <<EOF
28 Thu Sep 18 22:37:07 MSD 2008
29 author
30 EOF
32 cd ../temp1
33 echo second >> b
34 darcs record --pipe --all --patch-name=second <<EOF
35 Thu Sep 18 22:37:07 MSD 2008
36 author
37 EOF
39 darcs pull --all --dont-allow-conflicts ../temp2
40 test `darcs changes --count` = "4"
41 cd ..
43 rm -rf temp1 temp2