Mercurial > hg
changeset 21125:e94e90a4526e
context: tell when .ancestor picks one of multiple common ancestors heads
Show a message like
note: using 0f6b37dbe527 as ancestor of adfe50279922 and cf89f02107e5
So far this is just a warning - there is nothing the user can do to select
another ancestor.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Thu, 17 Apr 2014 17:32:04 +0200 |
| parents | a65714215377 |
| children | 99b5eaf372a7 |
| files | mercurial/context.py tests/test-merge-criss-cross.t |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Thu Apr 17 09:36:09 2014 +0900 +++ b/mercurial/context.py Thu Apr 17 17:32:04 2014 +0200 @@ -402,8 +402,17 @@ n2 = c2._node if n2 is None: n2 = c2._parents[0]._node - n = self._repo.changelog.ancestor(self._node, n2) - return changectx(self._repo, n) + cahs = self._repo.changelog.commonancestorsheads(self._node, n2) + if not cahs: + anc = nullid + elif len(cahs) == 1: + anc = cahs[0] + else: + anc = self._repo.changelog.ancestor(self._node, n2) + self._repo.ui.status( + (_("note: using %s as ancestor of %s and %s\n") % + (short(anc), short(self._node), short(n2)))) + return changectx(self._repo, anc) def descendant(self, other): """True if other is descendant of this changeset"""
--- a/tests/test-merge-criss-cross.t Thu Apr 17 09:36:09 2014 +0900 +++ b/tests/test-merge-criss-cross.t Thu Apr 17 17:32:04 2014 +0200 @@ -23,7 +23,9 @@ $ echo '5 second change' > f1 $ hg ci -m '5 second change f1' - $ hg up -qr3 + $ hg up -r3 + note: using 0f6b37dbe527 as ancestor of adfe50279922 and cf89f02107e5 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo '6 second change' > f2 $ hg ci -m '6 second change f2' @@ -72,6 +74,7 @@ $ hg merge -v --debug --tool internal:dump 5 + note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 searching for copies back to rev 3 resolving manifests branchmerge: True, force: False, partial: False