From: Ɓukasz Rekucki Date: Thu, 8 Oct 2009 13:35:15 +0000 (+0200) Subject: Szybki bug fix w RAL. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/05dbee77e04a759128a17cb988cb94732490f641?ds=sidebyside;hp=b6a988bcb0532fa8bce3f1dab8862bb53ade7b3b Szybki bug fix w RAL. --- diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py index e7145616..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()