Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: print debug message when clearing dirstate and wdir clean
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 05 Mar 2020 08:37:08 -0800
changeset 44442 6306baa7d19a
parent 44441 8cdd0b9629e3
child 44443 bc1786973c6d
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
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-graft.t file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py	Thu Mar 05 10:46:31 2020 -0800
+++ b/mercurial/localrepo.py	Thu Mar 05 08:37:08 2020 -0800
@@ -2956,6 +2956,7 @@
                 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
 
--- a/tests/test-graft.t	Thu Mar 05 10:46:31 2020 -0800
+++ b/tests/test-graft.t	Thu Mar 05 08:37:08 2020 -0800
@@ -758,6 +758,7 @@
    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
Mercurial