# HG changeset patch # User Martin von Zweigbergk # Date 2020-03-05 16:37:08 # Node ID 6306baa7d19a4aff0bd0248880f924b455b1ded7 # Parent 8cdd0b9629e3dbfb54199b8db58c4bc7f019dadf commit: print debug message when clearing dirstate and wdir clean This case is a little weird, so let's have a debug message. Differential Revision: https://phab.mercurial-scm.org/D8231 diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -2956,6 +2956,7 @@ class localrepository(object): or self.ui.configbool(b'ui', b'allowemptycommit') ) if not allowemptycommit: + self.ui.debug(b'nothing to commit, clearing merge state\n') ms.reset() return None diff --git a/tests/test-graft.t b/tests/test-graft.t --- a/tests/test-graft.t +++ b/tests/test-graft.t @@ -758,6 +758,7 @@ Transplants of grafts can find a destina branchmerge: True, force: True, partial: False ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87 starting 4 threads for background file closing (?) + nothing to commit, clearing merge state note: graft of 13:7a4785234d87 created no changes to commit $ hg log -r 'destination(13)' All copies of a cset