X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/46fdcc29313a6c0dd897b8060335061f433897fd..a5dd9b05d1136543817c697ecd0d878a1aa4d260:/lib/wlrepo/mercurial_backend/__init__.py?ds=inline diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py index 630939f7..22a9d520 100644 --- a/lib/wlrepo/mercurial_backend/__init__.py +++ b/lib/wlrepo/mercurial_backend/__init__.py @@ -1,5 +1,8 @@ # -*- encoding: utf-8 -*- +import logging +log = logging.getLogger('ral.mercurial') + __author__= "Łukasz Rekucki" __date__ = "$2009-09-25 09:20:22$" __doc__ = "Module documentation." @@ -86,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()