From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Thu, 8 Oct 2009 15:44:44 +0000 (+0200)
Subject: Fixed unicode commit messages in Revision.merge_with
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/05cab23f88a48c20cde89c7003afe3fa3d2e016d?ds=sidebyside

Fixed unicode commit messages in Revision.merge_with
---

diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py
index f919e817..630939f7 100644
--- a/lib/wlrepo/mercurial_backend/__init__.py
+++ b/lib/wlrepo/mercurial_backend/__init__.py
@@ -79,6 +79,7 @@ class MercurialRevision(wlrepo.Revision):
         return bool(self._library._hgrepo.changelog.children(self.hgrev()))
 
     def merge_with(self, other, user, message):
+        message = self._library._sanitize_string(message)
         lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())