equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
2 |
2 |
3 hg init |
3 hg init |
4 echo foo > a |
4 echo foo > a |
5 hg add a |
5 hg add a |
6 hg commit -m "1" -d "0 0" |
6 hg commit -m "1" -d "1000000 0" |
7 |
7 |
8 echo bar > b |
8 echo bar > b |
9 hg add b |
9 hg add b |
10 hg remove a |
10 hg remove a |
11 |
11 |
20 |
20 |
21 rm b |
21 rm b |
22 |
22 |
23 hg co -C 0 |
23 hg co -C 0 |
24 echo foo-a > a |
24 echo foo-a > a |
25 hg commit -m "2a" -d "0 0" |
25 hg commit -m "2a" -d "1000000 0" |
26 |
26 |
27 hg co -C 0 |
27 hg co -C 0 |
28 echo foo-b > a |
28 echo foo-b > a |
29 hg commit -m "2b" -d "0 0" |
29 hg commit -m "2b" -d "1000000 0" |
30 |
30 |
31 HGMERGE=true hg update -m 1 |
31 HGMERGE=true hg update -m 1 |
32 |
32 |
33 echo "%%% should show foo-b" |
33 echo "%%% should show foo-b" |
34 cat a |
34 cat a |