Submitter | Mads Kiilerich |
---|---|
Date | Feb. 24, 2014, 10:19 p.m. |
Message ID | <c5b597a62f2231919df8.1393280355@mk-desktop> |
Download | mbox | patch |
Permalink | /patch/3749/ |
State | Deferred |
Headers | show |
Comments
Patch
diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -410,6 +410,12 @@ _("warning: multiple ancestors of %s and %s: %s\n") % (short(self._node), short(n2), ' '.join(short(n) for n in sorted(ancs)))) + for r in self._repo.ui.config('ui', 'topancestors', '').split(): + ctx = changectx(self._repo, r) + if ctx.node() in ancs: + self._repo.ui.status(_('picked topancestor %s\n') % + short(ctx.node())) + return ctx return changectx(self._repo, min(ancs)) def descendant(self, other):