Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 21171:33737ebc6f39 stable
merge: tell the user when we are using bid merge
Bid merge is a new rarely used feature that the user explicitly enabled - we
should tell/warn when the user actually is using it, just like we tell when we
not are using it.
Give a message like
note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 18 Apr 2014 13:33:20 +0200 |
| parents | ea3972243320 |
| children | 0f0059af920c |
comparison
equal
deleted
inserted
replaced
| 21170:ea3972243320 | 21171:33737ebc6f39 |
|---|---|
| 728 actions = manifestmerge(repo, wctx, mctx, ancestors[0], | 728 actions = manifestmerge(repo, wctx, mctx, ancestors[0], |
| 729 branchmerge, force, | 729 branchmerge, force, |
| 730 partial, acceptremote, followcopies) | 730 partial, acceptremote, followcopies) |
| 731 | 731 |
| 732 else: # only when merge.preferancestor=* - experimentalish code | 732 else: # only when merge.preferancestor=* - experimentalish code |
| 733 repo.ui.status( | |
| 734 _("note: merging %s and %s using bids from ancestors %s\n") % | |
| 735 (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors))) | |
| 736 | |
| 733 # Call for bids | 737 # Call for bids |
| 734 fbids = {} # mapping filename to list af action bids | 738 fbids = {} # mapping filename to list af action bids |
| 735 for ancestor in ancestors: | 739 for ancestor in ancestors: |
| 736 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor) | 740 repo.ui.note(_('\ncalculating bids for ancestor %s\n') % ancestor) |
| 737 actions = manifestmerge(repo, wctx, mctx, ancestor, | 741 actions = manifestmerge(repo, wctx, mctx, ancestor, |