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 f919e81..630939f 100644 (file)
--- 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):
         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())
         lock = self._library.lock(True)
         try:
             self._library._checkout(self._changectx.node())