Podwyższenie wymaganej wersji biblioteki librarian do 1.2.5 (wydanej dzisiaj).

[redakcja.git] / lib / wlrepo / mercurial_backend / document.py

diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py
index a579fb7..e714561 100644 (file)
--- a/lib/wlrepo/mercurial_backend/document.py
+++ b/lib/wlrepo/mercurial_backend/document.py
@@ -189,7 +189,7 @@ class MercurialDocument(wlrepo.Document):
                     return False
 
                 if changed:
                     return False
 
                 if changed:

-                    local = local.latest()
+                    local = self.latest()._revision

                     
                 success, changed = main.merge_with(local, user=user,\
                     message=message)
                     
                 success, changed = main.merge_with(local, user=user,\
                     message=message)