fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
[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
536d08c
..
22a9d52
100644
(file)
--- a/
lib/wlrepo/mercurial_backend/__init__.py
+++ b/
lib/wlrepo/mercurial_backend/__init__.py
@@
-89,9
+89,9
@@
class MercurialRevision(wlrepo.Revision):
status = self._library._merge(other._changectx.node())
if status.isclean():
self._library._commit(user=user, message=message)
- return
(True, True)
+ return
True
else:
- return
(False, False)
+ return
False
finally:
lock.release()