equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
2 |
|
3 export HGMERGE=true |
|
4 |
2 |
5 set -ex |
3 set -ex |
6 mkdir r1 |
4 mkdir r1 |
7 cd r1 |
5 cd r1 |
8 hg init |
6 hg init |
9 echo a > a |
7 echo a > a |
10 hg addremove |
8 hg addremove |
11 hg commit -t "1" -u test -d "0 0" |
9 hg commit -m "1" -d "0 0" |
12 |
10 |
13 hg clone . ../r2 |
11 hg clone . ../r2 |
14 cd ../r2 |
12 cd ../r2 |
15 hg up |
13 hg up |
16 echo abc > a |
14 echo abc > a |
19 |
17 |
20 cd ../r1 |
18 cd ../r1 |
21 echo b > b |
19 echo b > b |
22 echo a2 > a |
20 echo a2 > a |
23 hg addremove |
21 hg addremove |
24 hg commit -t "2" -u test -d "0 0" |
22 hg commit -m "2" -d "0 0" |
25 |
23 |
26 cd ../r2 |
24 cd ../r2 |
27 hg -q pull ../r1 |
25 hg -q pull ../r1 |
28 hg status |
26 hg status |
29 hg --debug up |
27 hg --debug up |