a = self._changectx.ancestor(other._changectx)
return (a.branch() == self._changectx.branch())
+ def has_children(self):
+ children = self._library._hgrepo.changelog.children(self.hgrev())
+ print "C:", children, bool(children)
+ return bool(children)
+
def merge_with(self, other, user, message):
lock = self._library.lock(True)
try: