fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
da2ddd3
)
Fixed unicode commit messages in Revision.merge_with
author
Łukasz Rekucki
<lrekucki@gmail.com>
Thu, 8 Oct 2009 15:44:44 +0000
(17:44 +0200)
committer
Łukasz Rekucki
<lrekucki@gmail.com>
Thu, 8 Oct 2009 15:44:44 +0000
(17:44 +0200)
lib/wlrepo/mercurial_backend/__init__.py
patch
|
blob
|
history
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):
+ message = self._library._sanitize_string(message)
lock = self._library.lock(True)
try:
self._library._checkout(self._changectx.node())