Mercurial > hg
comparison tests/test-merge-criss-cross.t @ 44162:baf3fe2977cc
copies: move early return in mergecopies() earlier
It wasn't obvious that the early return happened only when there are
no copies. That is the case, however, because if `fullcopy` is empty,
then so is `copies1` and `copies2`, and then so is `inversecopies1`
and `inversecopies2`, and then so is `allsources`, and then so is
`copy`, `diverge` and `renamedelete`.
By moving the early return earlier, we also avoid calculating the set
of added files from the base to each side.
Differential Revision: https://phab.mercurial-scm.org/D7975
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 22 Jan 2020 15:20:12 -0800 |
parents | 91a0bc50b288 |
children | 17e12938f8e7 |
comparison
equal
deleted
inserted
replaced
44161:d7622fdec3b5 | 44162:baf3fe2977cc |
---|---|
408 | 408 |
409 $ hg merge 3 --debug | 409 $ hg merge 3 --debug |
410 note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e | 410 note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e |
411 | 411 |
412 calculating bids for ancestor 11b5b303e36c | 412 calculating bids for ancestor 11b5b303e36c |
413 unmatched files in local: | |
414 d1/a | |
415 d1/b | |
416 unmatched files in other: | |
417 d2/b | |
418 resolving manifests | 413 resolving manifests |
419 branchmerge: True, force: False, partial: False | 414 branchmerge: True, force: False, partial: False |
420 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 | 415 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
421 d2/b: remote created -> g | 416 d2/b: remote created -> g |
422 | 417 |