equal
deleted
inserted
replaced
6 hg init repo |
6 hg init repo |
7 cd repo |
7 cd repo |
8 |
8 |
9 echo foo > foo |
9 echo foo > foo |
10 echo a > bar |
10 echo a > bar |
11 hg ci -Am 'add foo' -d '0 0' |
11 hg ci -Am 'add foo' |
12 |
12 |
13 hg mv foo baz |
13 hg mv foo baz |
14 echo b >> bar |
14 echo b >> bar |
15 echo quux > quux1 |
15 echo quux > quux1 |
16 hg ci -Am 'mv foo baz' -d '0 0' |
16 hg ci -Am 'mv foo baz' |
17 |
17 |
18 hg up -qC 0 |
18 hg up -qC 0 |
19 echo >> foo |
19 echo >> foo |
20 echo c >> bar |
20 echo c >> bar |
21 echo quux > quux2 |
21 echo quux > quux2 |
22 hg ci -Am 'change foo' -d '0 0' |
22 hg ci -Am 'change foo' |
23 |
23 |
24 # test with the rename on the remote side |
24 # test with the rename on the remote side |
25 HGMERGE=false hg merge |
25 HGMERGE=false hg merge |
26 hg resolve -l |
26 hg resolve -l |
27 |
27 |