Mercurial > hg
comparison tests/test-merge-commit.t @ 42167:91a0bc50b288
copies: delete debug message about search limit
I'm about to rewrite mergecopies() and this message will no longer be
emitted then. Let's remove the message now to remove a distraction
from that patch.
Differential Revision: https://phab.mercurial-scm.org/D6249
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 11 Apr 2019 23:28:38 -0700 |
| parents | d4e62df1c73d |
| children | 69429972ff1f |
comparison
equal
deleted
inserted
replaced
| 42166:85f5934016f9 | 42167:91a0bc50b288 |
|---|---|
| 65 0:2665aaee66e9 | 65 0:2665aaee66e9 |
| 66 | 66 |
| 67 This should use bar@rev2 as the ancestor: | 67 This should use bar@rev2 as the ancestor: |
| 68 | 68 |
| 69 $ hg --debug merge 3 | 69 $ hg --debug merge 3 |
| 70 searching for copies back to rev 1 | |
| 71 resolving manifests | 70 resolving manifests |
| 72 branchmerge: True, force: False, partial: False | 71 branchmerge: True, force: False, partial: False |
| 73 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 | 72 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
| 74 preserving bar for resolve of bar | 73 preserving bar for resolve of bar |
| 75 starting 4 threads for background file closing (?) | 74 starting 4 threads for background file closing (?) |
| 153 0:2665aaee66e9 | 152 0:2665aaee66e9 |
| 154 | 153 |
| 155 This should use bar@rev2 as the ancestor: | 154 This should use bar@rev2 as the ancestor: |
| 156 | 155 |
| 157 $ hg --debug merge 3 | 156 $ hg --debug merge 3 |
| 158 searching for copies back to rev 1 | |
| 159 resolving manifests | 157 resolving manifests |
| 160 branchmerge: True, force: False, partial: False | 158 branchmerge: True, force: False, partial: False |
| 161 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 | 159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
| 162 preserving bar for resolve of bar | 160 preserving bar for resolve of bar |
| 163 starting 4 threads for background file closing (?) | 161 starting 4 threads for background file closing (?) |