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 children(self):
+ return bool(self._library._hgrepo.changelog.children(self.hgrev()))
def merge_with(self, other, user, message):
lock = self._library.lock(True)
ops(self._library, entry_path)
message, user = commit_info(self)
+
+ message = self._library._sanitize_string(message)
+ user = self._library._sanitize_string(user)
+
self._library._commit(message, user)
try:
return self._library.document(docid=self.id, user=user)