586 (short(anc), short(self._node), short(n2))) + |
586 (short(anc), short(self._node), short(n2))) + |
587 ''.join(_(" alternatively, use --config " |
587 ''.join(_(" alternatively, use --config " |
588 "merge.preferancestor=%s\n") % |
588 "merge.preferancestor=%s\n") % |
589 short(n) for n in sorted(cahs) if n != anc)) |
589 short(n) for n in sorted(cahs) if n != anc)) |
590 return changectx(self._repo, anc) |
590 return changectx(self._repo, anc) |
|
591 |
|
592 def descendant(self, other): |
|
593 msg = (b'ctx.descendant(other) is deprecated, ' |
|
594 'use ctx.isancestorof(other)') |
|
595 self._repo.ui.deprecwarn(msg, b'4.7') |
|
596 return self.isancestorof(other) |
591 |
597 |
592 def isancestorof(self, other): |
598 def isancestorof(self, other): |
593 """True if this changeset is an ancestor of other""" |
599 """True if this changeset is an ancestor of other""" |
594 return self._repo.changelog.isancestorrev(self._rev, other._rev) |
600 return self._repo.changelog.isancestorrev(self._rev, other._rev) |
595 |
601 |