| marmoute |
| hg-reviewers |
Earlier, we were showing the list of bids only when we were ambiguously picking.
However, the cases where we unambiguously picked a side may not always be
correct and need to be fixed.
Having list of bids for all files will be helpful in debugging.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (5 lines) | |||
| M | tests/test-merge-criss-cross.t (25 lines) |
| # Call for bids | # Call for bids | ||||
| # Pick the best bid for each file | # Pick the best bid for each file | ||||
| repo.ui.note( | repo.ui.note( | ||||
| _(b'\nauction for merging merge bids (%d ancestors)\n') | _(b'\nauction for merging merge bids (%d ancestors)\n') | ||||
| % len(ancestors) | % len(ancestors) | ||||
| ) | ) | ||||
| mresult = mergeresult() | mresult = mergeresult() | ||||
| for f, bids in sorted(fbids.items()): | for f, bids in sorted(fbids.items()): | ||||
| if repo.ui.debugflag: | |||||
| repo.ui.debug(b" list of bids for %s:\n" % f) | |||||
| for m, l in sorted(bids.items()): | |||||
| for _f, args, msg in l: | |||||
| repo.ui.debug(b' %s -> %s\n' % (msg, m)) | |||||
| # bids is a mapping from action method to list af actions | # bids is a mapping from action method to list af actions | ||||
| # Consensus? | # Consensus? | ||||
| if len(bids) == 1: # all bids are the same kind of method | if len(bids) == 1: # all bids are the same kind of method | ||||
| m, l = list(bids.items())[0] | m, l = list(bids.items())[0] | ||||
| if all(a == l[0] for a in l[1:]): # len(bids) is > 1 | if all(a == l[0] for a in l[1:]): # len(bids) is > 1 | ||||
| repo.ui.note(_(b" %s: consensus for %s\n") % (f, m)) | repo.ui.note(_(b" %s: consensus for %s\n") % (f, m)) | ||||
| mresult.addfile(f, *l[0]) | mresult.addfile(f, *l[0]) | ||||
| continue | continue | ||||
| calculating bids for ancestor 40663881a6dd | calculating bids for ancestor 40663881a6dd | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 | ||||
| f1: versions differ -> m | f1: versions differ -> m | ||||
| f2: remote unchanged -> k | f2: remote unchanged -> k | ||||
| auction for merging merge bids (2 ancestors) | auction for merging merge bids (2 ancestors) | ||||
| list of bids for f1: | |||||
| remote is newer -> g | |||||
| versions differ -> m | |||||
| f1: picking 'get' action | f1: picking 'get' action | ||||
| list of bids for f2: | |||||
| remote unchanged -> k | |||||
| versions differ -> m | |||||
| f2: picking 'keep' action | f2: picking 'keep' action | ||||
| end of auction | end of auction | ||||
| f1: remote is newer -> g | f1: remote is newer -> g | ||||
| getting f1 | getting f1 | ||||
| f2: remote unchanged -> k | f2: remote unchanged -> k | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| calculating bids for ancestor 40663881a6dd | calculating bids for ancestor 40663881a6dd | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 | ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 | ||||
| f1: versions differ -> m | f1: versions differ -> m | ||||
| f2: remote is newer -> g | f2: remote is newer -> g | ||||
| auction for merging merge bids (2 ancestors) | auction for merging merge bids (2 ancestors) | ||||
| list of bids for f1: | |||||
| remote unchanged -> k | |||||
| versions differ -> m | |||||
| f1: picking 'keep' action | f1: picking 'keep' action | ||||
| list of bids for f2: | |||||
| remote is newer -> g | |||||
| versions differ -> m | |||||
| f2: picking 'get' action | f2: picking 'get' action | ||||
| end of auction | end of auction | ||||
| f2: remote is newer -> g | f2: remote is newer -> g | ||||
| getting f2 | getting f2 | ||||
| f1: remote unchanged -> k | f1: remote unchanged -> k | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| calculating bids for ancestor 40663881a6dd | calculating bids for ancestor 40663881a6dd | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 | ||||
| f1: versions differ -> m | f1: versions differ -> m | ||||
| f2: remote unchanged -> k | f2: remote unchanged -> k | ||||
| auction for merging merge bids (2 ancestors) | auction for merging merge bids (2 ancestors) | ||||
| list of bids for f1: | |||||
| remote is newer -> g | |||||
| versions differ -> m | |||||
| f1: picking 'get' action | f1: picking 'get' action | ||||
| list of bids for f2: | |||||
| remote unchanged -> k | |||||
| versions differ -> m | |||||
| f2: picking 'keep' action | f2: picking 'keep' action | ||||
| end of auction | end of auction | ||||
| f1: remote is newer -> g | f1: remote is newer -> g | ||||
| getting f1 | getting f1 | ||||
| f2: remote unchanged -> k | f2: remote unchanged -> k | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| resolving manifests | resolving manifests | ||||
| branchmerge: True, force: False, partial: False | branchmerge: True, force: False, partial: False | ||||
| ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 | ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 | ||||
| d1/a: other deleted -> r | d1/a: other deleted -> r | ||||
| d1/b: other deleted -> r | d1/b: other deleted -> r | ||||
| d2/b: remote created -> g | d2/b: remote created -> g | ||||
| auction for merging merge bids (2 ancestors) | auction for merging merge bids (2 ancestors) | ||||
| list of bids for d1/a: | |||||
| other deleted -> r | |||||
| d1/a: consensus for r | d1/a: consensus for r | ||||
| list of bids for d1/b: | |||||
| other deleted -> r | |||||
| d1/b: consensus for r | d1/b: consensus for r | ||||
| list of bids for d2/b: | |||||
| remote created -> g | |||||
| remote created -> g | |||||
| d2/b: consensus for g | d2/b: consensus for g | ||||
| end of auction | end of auction | ||||
| d1/a: other deleted -> r | d1/a: other deleted -> r | ||||
| removing d1/a | removing d1/a | ||||
| d1/b: other deleted -> r | d1/b: other deleted -> r | ||||
| removing d1/b | removing d1/b | ||||
| d2/b: remote created -> g | d2/b: remote created -> g | ||||
| getting d2/b | getting d2/b | ||||
| 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||