Mercurial > hgrepos > DevTools > mercurial-extensions

changeset 238:f28cfbaf9b59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Debug output of the global merge state also ("mdstate()")
author Franz Glasner <hg@dom66.de>
date Sat, 03 Nov 2018 12:55:53 +0100
parents 9249ca818ddf
children bed05593eb8c
files extensions/timestamps.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/timestamps.py	Wed Oct 31 09:40:53 2018 +0100
+++ b/extensions/timestamps.py	Sat Nov 03 12:55:53 2018 +0100
@@ -995,6 +995,8 @@
                               + repr(ms.files()) + '\n')
                 self.ui.debug("UPDATE MergeState _state: "
                               + repr(ms._state) + '\n')
+                self.ui.debug("UPDATE MergeState mdstate: "
+                              + repr(ms.mdstate()) + '\n')
             if ms.active():
                 to_update.difference_update(set(ms.files()))
             if _DEV: