From 05cab23f88a48c20cde89c7003afe3fa3d2e016d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Rekucki?= Date: Thu, 8 Oct 2009 17:44:44 +0200 Subject: [PATCH 1/1] Fixed unicode commit messages in Revision.merge_with --- lib/wlrepo/mercurial_backend/__init__.py | 1 + 1 file changed, 1 insertion(+) 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()) -- 2.20.1