Mercurial > hg
changeset 22673:16a46003b50c
merge: mute the status message when bid merge kicks in
Bid merge is now the default and it is not necessary to tell the user that an
experimental feature kicked in.
(It could however still be relevant to get a notice that it is one of the rare
criss-cross merge situations so the user is warned that the situation is more
tricky than usual.)
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 01 Oct 2014 03:42:00 +0200 |
| parents | 19903277f035 |
| children | 06c8b58647b9 |
| files | mercurial/merge.py tests/test-merge-criss-cross.t |
| diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Wed Oct 01 03:41:11 2014 +0200 +++ b/mercurial/merge.py Wed Oct 01 03:42:00 2014 +0200 @@ -780,7 +780,7 @@ partial, acceptremote, followcopies) else: # only when merge.preferancestor=* - the default - repo.ui.status( + repo.ui.note( _("note: merging %s and %s using bids from ancestors %s\n") % (wctx, mctx, _(' and ').join(str(anc) for anc in ancestors)))
--- a/tests/test-merge-criss-cross.t Wed Oct 01 03:41:11 2014 +0200 +++ b/tests/test-merge-criss-cross.t Wed Oct 01 03:42:00 2014 +0200 @@ -210,7 +210,6 @@ $ hg up -qC $ hg merge - note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)