Mercurial > hg
comparison tests/test-merge-types.t @ 21391:cb15835456cb
merge: change debug logging - test output changes but no real changes
Preparing for action list split-up, making sure the final change don't have any
test changes.
The patch moves debug statements around without really changing anything.
Arguably, it temporarily makes the code worse. The only justification is that
it makes it easier to review the test changes ... and in the end the big change
will not change test output at all.
The changes to test output are due to changes in the ordering of debug output.
That is mainly because we now do the debug logging for files when we actually
process them. Files are also processed in a slightly different but still
correct order. It is now primarily ordered by action type, secondarily by
filename.
The patch introduces some redundancy. Some of it will be removed again, some of
it will in the end help code readability and efficiency. It is possible that we
later on could introduce a "process this action list and do some logging and
progress reporting and apply this function".
The "preserving X for resolve" debug statements will only have single space
indentation. It will no longer have a leading single space indented "f: msg ->
m" message. Having this message double indented would thus no longer make
sense.
The bid actions will temporarily be sorted using a custom sort key that happens
to match the sort order the simplified code will have in the end.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Tue, 22 Apr 2014 02:10:25 +0200 |
| parents | e4f451c8c05c |
| children | 25d5a9ecbb85 |
comparison
equal
deleted
inserted
replaced
| 21390:26b84128c54d | 21391:cb15835456cb |
|---|---|
| 32 $ hg merge --debug | 32 $ hg merge --debug |
| 33 searching for copies back to rev 1 | 33 searching for copies back to rev 1 |
| 34 resolving manifests | 34 resolving manifests |
| 35 branchmerge: True, force: False, partial: False | 35 branchmerge: True, force: False, partial: False |
| 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c | 36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
| 37 preserving a for resolve of a | |
| 37 a: versions differ -> m | 38 a: versions differ -> m |
| 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 $ hg merge --debug | 66 $ hg merge --debug |
| 67 searching for copies back to rev 1 | 67 searching for copies back to rev 1 |
| 68 resolving manifests | 68 resolving manifests |
| 69 branchmerge: True, force: False, partial: False | 69 branchmerge: True, force: False, partial: False |
| 70 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | 70 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
| 71 preserving a for resolve of a | |
| 71 a: versions differ -> m | 72 a: versions differ -> m |
| 72 preserving a for resolve of a | |
| 73 updating: a 1/1 files (100.00%) | 73 updating: a 1/1 files (100.00%) |
| 74 picked tool 'internal:merge' for a (binary False symlink True) | 74 picked tool 'internal:merge' for a (binary False symlink True) |
| 75 merging a | 75 merging a |
| 76 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | 76 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
| 77 warning: internal:merge cannot merge symlinks for a | 77 warning: internal:merge cannot merge symlinks for a |
| 100 $ HGMERGE= hg up -y --debug | 100 $ HGMERGE= hg up -y --debug |
| 101 searching for copies back to rev 2 | 101 searching for copies back to rev 2 |
| 102 resolving manifests | 102 resolving manifests |
| 103 branchmerge: False, force: False, partial: False | 103 branchmerge: False, force: False, partial: False |
| 104 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f | 104 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
| 105 preserving a for resolve of a | |
| 105 a: versions differ -> m | 106 a: versions differ -> m |
| 106 preserving a for resolve of a | |
| 107 updating: a 1/1 files (100.00%) | 107 updating: a 1/1 files (100.00%) |
| 108 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | 108 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
| 109 picked tool 'internal:prompt' for a (binary False symlink True) | 109 picked tool 'internal:prompt' for a (binary False symlink True) |
| 110 no tool found to merge a | 110 no tool found to merge a |
| 111 keep (l)ocal or take (o)ther? l | 111 keep (l)ocal or take (o)ther? l |