Mercurial > hg
comparison tests/test-rebase-conflicts.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 | b081decd9062 |
comparison
equal
deleted
inserted
replaced
| 21390:26b84128c54d | 21391:cb15835456cb |
|---|---|
| 218 update to 2:4bc80088dc6b | 218 update to 2:4bc80088dc6b |
| 219 resolving manifests | 219 resolving manifests |
| 220 branchmerge: False, force: True, partial: False | 220 branchmerge: False, force: True, partial: False |
| 221 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b | 221 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
| 222 f2.txt: other deleted -> r | 222 f2.txt: other deleted -> r |
| 223 f1.txt: remote created -> g | |
| 224 removing f2.txt | 223 removing f2.txt |
| 225 updating: f2.txt 1/2 files (50.00%) | 224 updating: f2.txt 1/2 files (50.00%) |
| 225 f1.txt: remote created -> g | |
| 226 getting f1.txt | 226 getting f1.txt |
| 227 updating: f1.txt 2/2 files (100.00%) | 227 updating: f1.txt 2/2 files (100.00%) |
| 228 merge against 9:e31216eec445 | 228 merge against 9:e31216eec445 |
| 229 detach base 8:8e4e2c1a07ae | 229 detach base 8:8e4e2c1a07ae |
| 230 searching for copies back to rev 3 | 230 searching for copies back to rev 3 |
| 253 update back to initial working directory parent | 253 update back to initial working directory parent |
| 254 resolving manifests | 254 resolving manifests |
| 255 branchmerge: False, force: False, partial: False | 255 branchmerge: False, force: False, partial: False |
| 256 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 | 256 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
| 257 f1.txt: other deleted -> r | 257 f1.txt: other deleted -> r |
| 258 f2.txt: remote created -> g | |
| 259 removing f1.txt | 258 removing f1.txt |
| 260 updating: f1.txt 1/2 files (50.00%) | 259 updating: f1.txt 1/2 files (50.00%) |
| 260 f2.txt: remote created -> g | |
| 261 getting f2.txt | 261 getting f2.txt |
| 262 updating: f2.txt 2/2 files (100.00%) | 262 updating: f2.txt 2/2 files (100.00%) |
| 263 3 changesets found | 263 3 changesets found |
| 264 list of changesets: | 264 list of changesets: |
| 265 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c | 265 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |