Mercurial > hg
comparison mercurial/merge.py @ 21172:0f0059af920c stable
merge: improve notes for listing the bids for ambiguous merges
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 21 Apr 2014 20:24:54 +0200 |
| parents | 33737ebc6f39 |
| children | 9f12d8665c7b |
comparison
equal
deleted
inserted
replaced
| 21171:33737ebc6f39 | 21172:0f0059af920c |
|---|---|
| 779 repo.ui.note(" %s: picking 'get' action\n" % f) | 779 repo.ui.note(" %s: picking 'get' action\n" % f) |
| 780 actions.append(ga0) | 780 actions.append(ga0) |
| 781 continue | 781 continue |
| 782 # TODO: Consider other simple actions such as mode changes | 782 # TODO: Consider other simple actions such as mode changes |
| 783 # Handle inefficient democrazy. | 783 # Handle inefficient democrazy. |
| 784 repo.ui.note(_(' %s: multiple merge bids:\n') % f) | 784 repo.ui.note(_(' %s: multiple bids for merge action:\n') % f) |
| 785 for a in bidsl: | 785 for _f, m, args, msg in bidsl: |
| 786 repo.ui.note(' %s: %s\n' % (f, a[1])) | 786 repo.ui.note(' %s -> %s\n' % (msg, m)) |
| 787 # Pick random action. TODO: Instead, prompt user when resolving | 787 # Pick random action. TODO: Instead, prompt user when resolving |
| 788 a0 = bidsl[0] | 788 a0 = bidsl[0] |
| 789 repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') % | 789 repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') % |
| 790 (f, a0[1])) | 790 (f, a0[1])) |
| 791 actions.append(a0) | 791 actions.append(a0) |