X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/eb77cf373a37d609fcf39626c36d2878d4a60e6c..9bec1deeed00ac693e6031c69f0778d3bb0dfbd9:/lib/wlrepo/mercurial_backend/__init__.py?ds=sidebyside

diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py
index c1d3d30f..2d0ce828 100644
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -5,6 +5,7 @@ __date__ = "$2009-09-25 09:20:22$"
 __doc__ = "Module documentation."
 
 import wlrepo
+from mercurial.node import nullid
 
 class MercurialRevision(wlrepo.Revision):
 
@@ -65,11 +66,11 @@ class MercurialRevision(wlrepo.Revision):
         return (a.branch() == self._changectx.branch())
 
     def merge_with(self, other, user, message):
-        lock = self._library._lock(True)
+        lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())
             status = self._library._merge(other._changectx.node())
-            if status.is_clean():
+            if status.isclean():
                 self._library._commit(user=user, message=message)
                 return (True, True)
             else: