Mercurial > hg
comparison tests/test-merge-commit.out @ 5371:17ed9b9a0d03
merge: add debug diagnostics for findcopies
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 04 Oct 2007 19:44:37 -0500 |
parents | e7282dede8cd |
children | 5af5f0f9d724 |
comparison
equal
deleted
inserted
replaced
5368:61462e7d62ed | 5371:17ed9b9a0d03 |
---|---|
21 0:2665aaee66e9 | 21 0:2665aaee66e9 |
22 % this should use bar@rev2 as the ancestor | 22 % this should use bar@rev2 as the ancestor |
23 resolving manifests | 23 resolving manifests |
24 overwrite None partial False | 24 overwrite None partial False |
25 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 | 25 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1 |
26 searching for copies back to rev 1 | |
26 bar: versions differ -> m | 27 bar: versions differ -> m |
27 merging bar | 28 merging bar |
28 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 | 29 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510 |
29 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
30 (branch merge, don't forget to commit) | 31 (branch merge, don't forget to commit) |
66 0:2665aaee66e9 | 67 0:2665aaee66e9 |
67 % this should use bar@rev2 as the ancestor | 68 % this should use bar@rev2 as the ancestor |
68 resolving manifests | 69 resolving manifests |
69 overwrite None partial False | 70 overwrite None partial False |
70 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 | 71 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897 |
72 searching for copies back to rev 1 | |
71 bar: versions differ -> m | 73 bar: versions differ -> m |
72 merging bar | 74 merging bar |
73 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 | 75 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510 |
74 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 76 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
75 (branch merge, don't forget to commit) | 77 (branch merge, don't forget to commit) |