fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Poprawienie przycisku "wersja do druku""
[redakcja.git]
/
lib
/
wlrepo
/
mercurial_backend
/
__init__.py
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())