Merge branch 'master' into lqc-trunk

[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 5b1b820..5bb3d0f 100755 (executable)
--- a/lib/wlrepo/mercurial_backend/revision.py
+++ b/lib/wlrepo/mercurial_backend/revision.py
@@ -105,7 +105,7 @@ class MercurialRevision(wlrepo.Revision):
         if len(parents) == 1:
             return self._library._revision(parents[0])
         
-        if parents[0].branch() == self.branch():
+        if parents[0].branch() == self.hgbranch():
             return self._library._revision(parents[0])
         else:
             return self._library._revision(parents[1])