fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Przeniesienie menu na lewa strone.
[redakcja.git]
/
lib
/
wlrepo
/
mercurial_backend
/
revision.py
diff --git
a/lib/wlrepo/mercurial_backend/revision.py
b/lib/wlrepo/mercurial_backend/revision.py
index
80b761f
..
5bb3d0f
100755
(executable)
--- a/
lib/wlrepo/mercurial_backend/revision.py
+++ b/
lib/wlrepo/mercurial_backend/revision.py
@@
-103,9
+103,12
@@
class MercurialRevision(wlrepo.Revision):
parents = self._changectx.parents()
if len(parents) == 1:
parents = self._changectx.parents()
if len(parents) == 1:
- return parents[0]
-
- return parents[0] if (parents[0].branch() == self.branch()) else parents[1]
+ return self._library._revision(parents[0])
+
+ if parents[0].branch() == self.hgbranch():
+ return self._library._revision(parents[0])
+ else:
+ return self._library._revision(parents[1])
def __eq__(self, other):
return self._changectx.node() == other._changectx.node()
def __eq__(self, other):
return self._changectx.node() == other._changectx.node()