Mercurial > hg
comparison tests/test-merge-commit.out @ 8753:af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 08 Jun 2009 18:14:44 -0500 |
| parents | 368a4ec603cc |
| children | ba5e508b5e92 |
comparison
equal
deleted
inserted
replaced
| 8752:f177bdab261b | 8753:af5f099d932b |
|---|---|
| 20 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d | 20 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d |
| 21 2:0a3ab4856510 0:2665aaee66e9 | 21 2:0a3ab4856510 0:2665aaee66e9 |
| 22 1:5cd961e4045d | 22 1:5cd961e4045d |
| 23 0:2665aaee66e9 | 23 0:2665aaee66e9 |
| 24 % this should use bar@rev2 as the ancestor | 24 % this should use bar@rev2 as the ancestor |
| 25 searching for copies back to rev 1 | |
| 25 resolving manifests | 26 resolving manifests |
| 26 overwrite None partial False | 27 overwrite None partial False |
| 27 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 | 28 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 |
| 28 searching for copies back to rev 1 | |
| 29 bar: versions differ -> m | 29 bar: versions differ -> m |
| 30 preserving bar for resolve of bar | 30 preserving bar for resolve of bar |
| 31 picked tool 'internal:merge' for bar (binary False symlink False) | 31 picked tool 'internal:merge' for bar (binary False symlink False) |
| 32 merging bar | 32 merging bar |
| 33 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 | 33 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 |
| 70 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 | 70 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 |
| 71 2:0a3ab4856510 0:2665aaee66e9 | 71 2:0a3ab4856510 0:2665aaee66e9 |
| 72 1:5cd961e4045d | 72 1:5cd961e4045d |
| 73 0:2665aaee66e9 | 73 0:2665aaee66e9 |
| 74 % this should use bar@rev2 as the ancestor | 74 % this should use bar@rev2 as the ancestor |
| 75 searching for copies back to rev 1 | |
| 75 resolving manifests | 76 resolving manifests |
| 76 overwrite None partial False | 77 overwrite None partial False |
| 77 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 | 78 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 |
| 78 searching for copies back to rev 1 | |
| 79 bar: versions differ -> m | 79 bar: versions differ -> m |
| 80 preserving bar for resolve of bar | 80 preserving bar for resolve of bar |
| 81 picked tool 'internal:merge' for bar (binary False symlink False) | 81 picked tool 'internal:merge' for bar (binary False symlink False) |
| 82 merging bar | 82 merging bar |
| 83 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 | 83 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 |