fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of stigma:platforma
[redakcja.git]
/
lib
/
wlrepo
/
mercurial_backend
/
__init__.py
diff --git
a/lib/wlrepo/mercurial_backend/__init__.py
b/lib/wlrepo/mercurial_backend/__init__.py
index
9a22395
..
6dd3c11
100644
(file)
--- a/
lib/wlrepo/mercurial_backend/__init__.py
+++ b/
lib/wlrepo/mercurial_backend/__init__.py
@@
-72,6
+72,9
@@
class MercurialRevision(wlrepo.Revision):
a = self._changectx.ancestor(other._changectx)
return (a.branch() == self._changectx.branch())
a = self._changectx.ancestor(other._changectx)
return (a.branch() == self._changectx.branch())
+ def children(self):
+ return bool(self._library._hgrepo.changelog.children(self.hgrev()))
+
def merge_with(self, other, user, message):
lock = self._library.lock(True)
try:
def merge_with(self, other, user, message):
lock = self._library.lock(True)
try: