Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-double-merge @ 5047:d9689c6474bd
Merge with mpm
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 01 Aug 2007 14:26:30 -0700 |
| parents | f191bc3916f7 |
| children | 99a4592ea886 |
comparison
equal
deleted
inserted
replaced
| 5044:ed68c8c31c9a | 5047:d9689c6474bd |
|---|---|
| 1 #!/bin/sh | |
| 2 | |
| 3 hg init repo | |
| 4 cd repo | |
| 5 | |
| 6 echo line 1 > foo | |
| 7 hg ci -qAm 'add foo' -d "1000000 0" | |
| 8 | |
| 9 # copy foo to bar and change both files | |
| 10 hg cp foo bar | |
| 11 echo line 2-1 >> foo | |
| 12 echo line 2-2 >> bar | |
| 13 hg ci -m 'cp foo bar; change both' -d "1000000 0" | |
| 14 | |
| 15 # in another branch, change foo in a way that doesn't conflict with | |
| 16 # the other changes | |
| 17 hg up -qC 0 | |
| 18 echo line 0 >| foo | |
| 19 hg cat foo >> foo | |
| 20 hg ci -m 'change foo' -d "1000000 0" | |
| 21 | |
| 22 # we get conflicts that shouldn't be there | |
| 23 hg merge --debug | |
| 24 | |
| 25 echo "-- foo --" | |
| 26 cat foo | |
| 27 | |
| 28 echo "-- bar --" | |
| 29 cat bar | |
| 30 |