X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2384208b1967f12992caf087dca475d70fa765a3..69a0d5ba5c8f90d0c0006f7c14aae89875f66441:/lib/wlrepo/mercurial_backend/document.py?ds=inline

diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py
index a579fb75..d1c3e53d 100644
--- a/lib/wlrepo/mercurial_backend/document.py
+++ b/lib/wlrepo/mercurial_backend/document.py
@@ -115,7 +115,8 @@ class MercurialDocument(wlrepo.Document):
                 return (True, False)
 
 
-            return self._revision.merge_with(sv._revision, user=user)
+            return self._revision.merge_with(sv._revision, user=user,
+                message="$AUTO$ Personal branch update.")
         finally:
             lock.release()  
 
@@ -189,7 +190,7 @@ class MercurialDocument(wlrepo.Document):
                     return False
 
                 if changed:
-                    local = local.latest()
+                    local = self.latest()._revision
                     
                 success, changed = main.merge_with(local, user=user,\
                     message=message)