From: zuber <marek@stepniowski.com>
Date: Mon, 26 Oct 2009 10:05:46 +0000 (+0100)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/a2ddf506a8d76719f6e8a79e784b3f297128656e?hp=f8dc1e5b5062456deab01f927e82b753202f31e3

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
---

diff --git a/lib/wlrepo/mercurial_backend/revision.py b/lib/wlrepo/mercurial_backend/revision.py
index 5b1b820a..5bb3d0f1 100755
--- 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])