Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 21203:9f12d8665c7b stable
ancestor: silence multiple ancestor warning outside of merge (issue4234)
The current situation is a bit of a layering violation as
merge-specific knowledge is pushed down to lower layers and leaks
merge assumptions into other code paths.
Here, we simply silence the warning with a hack. Both the warning and
the hack will probably go away in the near future when bid merge is
made the default.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 30 Apr 2014 14:19:01 -0500 |
| parents | 0f0059af920c |
| children | 6ca05c46aa95 |
comparison
equal
deleted
inserted
replaced
| 21202:c04e5e937139 | 21203:9f12d8665c7b |
|---|---|
| 990 if pas[0] is None: | 990 if pas[0] is None: |
| 991 if repo.ui.config("merge", "preferancestor") == '*': | 991 if repo.ui.config("merge", "preferancestor") == '*': |
| 992 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) | 992 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node()) |
| 993 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] | 993 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])] |
| 994 else: | 994 else: |
| 995 pas = [p1.ancestor(p2)] | 995 pas = [p1.ancestor(p2, warn=True)] |
| 996 | 996 |
| 997 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | 997 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
| 998 | 998 |
| 999 ### check phase | 999 ### check phase |
| 1000 if not overwrite and len(pl) > 1: | 1000 if not overwrite and len(pl) > 1: |