Mercurial > hg
comparison tests/test-up-local-change.t @ 42168:341bddf88ac5
copies: delete debug message about changes since common ancestor
Same reasoning as previous patch.
Differential Revision: https://phab.mercurial-scm.org/D6250
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 12 Apr 2019 21:41:51 -0700 |
| parents | 91a0bc50b288 |
| children | baf3fe2977cc |
comparison
equal
deleted
inserted
replaced
| 42167:91a0bc50b288 | 42168:341bddf88ac5 |
|---|---|
| 65 date: Thu Jan 01 00:00:00 1970 +0000 | 65 date: Thu Jan 01 00:00:00 1970 +0000 |
| 66 summary: 2 | 66 summary: 2 |
| 67 | 67 |
| 68 $ hg --debug up 0 | 68 $ hg --debug up 0 |
| 69 starting 4 threads for background file closing (?) | 69 starting 4 threads for background file closing (?) |
| 70 unmatched files in local (from topological common ancestor): | |
| 71 b | |
| 72 resolving manifests | 70 resolving manifests |
| 73 branchmerge: False, force: False, partial: False | 71 branchmerge: False, force: False, partial: False |
| 74 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a | 72 ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
| 75 preserving a for resolve of a | 73 preserving a for resolve of a |
| 76 b: other deleted -> r | 74 b: other deleted -> r |