Mercurial > hg
changeset 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 | d4daebb21cf6 |
| files | mercurial/merge.py tests/test-merge-criss-cross.t |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Apr 18 13:33:20 2014 +0200 +++ b/mercurial/merge.py Mon Apr 21 20:24:54 2014 +0200 @@ -781,9 +781,9 @@ continue # TODO: Consider other simple actions such as mode changes # Handle inefficient democrazy. - repo.ui.note(_(' %s: multiple merge bids:\n') % f) - for a in bidsl: - repo.ui.note(' %s: %s\n' % (f, a[1])) + repo.ui.note(_(' %s: multiple bids for merge action:\n') % f) + for _f, m, args, msg in bidsl: + repo.ui.note(' %s -> %s\n' % (msg, m)) # Pick random action. TODO: Instead, prompt user when resolving a0 = bidsl[0] repo.ui.warn(_(' %s: ambiguous merge - picked %s action\n') %
--- a/tests/test-merge-criss-cross.t Fri Apr 18 13:33:20 2014 +0200 +++ b/tests/test-merge-criss-cross.t Mon Apr 21 20:24:54 2014 +0200 @@ -330,9 +330,9 @@ resolving manifests auction for merging merge bids - x: multiple merge bids: - x: m - x: m + x: multiple bids for merge action: + versions differ -> m + versions differ -> m x: ambiguous merge - picked m action end of auction