Mercurial > hg
comparison tests/test-merge-types.t @ 18541:5ed6a375e9ca
merge: delay debug messages for merge actions
Show messages at a point where the actions have been sorted, thus preparing for
backout of 760c0d67ce5e.
This makes manifestmerge more of a silent operation, just like 'copies' is.
Indent 'preserving' messages to make them subordinate to the action logging so
they fit in the new context. (The 'preserving' messages are quite redundant and
could also be removed completely.)
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 24 Jan 2013 23:57:44 +0100 |
| parents | 9de9727cea53 |
| children | bcf29565d89f |
comparison
equal
deleted
inserted
replaced
| 18540:139529b0a191 | 18541:5ed6a375e9ca |
|---|---|
| 33 searching for copies back to rev 1 | 33 searching for copies back to rev 1 |
| 34 resolving manifests | 34 resolving manifests |
| 35 overwrite: False, partial: False | 35 overwrite: False, partial: False |
| 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c | 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
| 37 a: versions differ -> m | 37 a: versions differ -> m |
| 38 preserving a for resolve of a | 38 preserving a for resolve of a |
| 39 updating: a 1/1 files (100.00%) | 39 updating: a 1/1 files (100.00%) |
| 40 picked tool 'internal:merge' for a (binary False symlink True) | 40 picked tool 'internal:merge' for a (binary False symlink True) |
| 41 merging a | 41 merging a |
| 42 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da | 42 my a@521a1e40188f+ other a@3574f3e69b1c ancestor a@c334dc3be0da |
| 43 warning: internal:merge cannot merge symlinks for a | 43 warning: internal:merge cannot merge symlinks for a |
| 66 searching for copies back to rev 1 | 66 searching for copies back to rev 1 |
| 67 resolving manifests | 67 resolving manifests |
| 68 overwrite: False, partial: False | 68 overwrite: False, partial: False |
| 69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 70 a: versions differ -> m | 70 a: versions differ -> m |
| 71 preserving a for resolve of a | 71 preserving a for resolve of a |
| 72 updating: a 1/1 files (100.00%) | 72 updating: a 1/1 files (100.00%) |
| 73 picked tool 'internal:merge' for a (binary False symlink True) | 73 picked tool 'internal:merge' for a (binary False symlink True) |
| 74 merging a | 74 merging a |
| 75 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 75 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 76 warning: internal:merge cannot merge symlinks for a | 76 warning: internal:merge cannot merge symlinks for a |
| 100 searching for copies back to rev 2 | 100 searching for copies back to rev 2 |
| 101 resolving manifests | 101 resolving manifests |
| 102 overwrite: False, partial: False | 102 overwrite: False, partial: False |
| 103 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f | 103 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
| 104 a: versions differ -> m | 104 a: versions differ -> m |
| 105 preserving a for resolve of a | 105 preserving a for resolve of a |
| 106 updating: a 1/1 files (100.00%) | 106 updating: a 1/1 files (100.00%) |
| 107 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | 107 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
| 108 picked tool 'internal:prompt' for a (binary False symlink True) | 108 picked tool 'internal:prompt' for a (binary False symlink True) |
| 109 no tool found to merge a | 109 no tool found to merge a |
| 110 keep (l)ocal or take (o)ther? l | 110 keep (l)ocal or take (o)ther? l |