| Submitter | Mads Kiilerich |
|---|---|
| Date | April 22, 2014, 12:24 a.m. |
| Message ID | <15d90f7a50daf66273d8.1398126260@localhost.localdomain> |
| Download | mbox | patch |
| Permalink | /patch/4418/ |
| State | Accepted |
| Commit | 0f0059af920cd59f7c555705b95122670d03ebfa |
| Headers | show |
Comments
On Tue, 2014-04-22 at 02:24 +0200, Mads Kiilerich wrote: > # HG changeset patch > # User Mads Kiilerich <madski@unity3d.com> > # Date 1398104694 -7200 > # Mon Apr 21 20:24:54 2014 +0200 > # Branch stable > # Node ID 15d90f7a50daf66273d8fa85977103d2f1fc03fc > # Parent e73e180e661c68d00701078b9628feb44f4fe5fb > merge: improve notes for listing the bids for ambiguous merges These are queued for stable, thanks.
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -781,9 +781,9 @@ def calculateupdates(repo, wctx, mctx, a 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') % diff --git a/tests/test-merge-criss-cross.t b/tests/test-merge-criss-cross.t --- a/tests/test-merge-criss-cross.t +++ b/tests/test-merge-criss-cross.t @@ -330,9 +330,9 @@ http://stackoverflow.com/questions/93500 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