# HG changeset patch # User Pierre-Yves David # Date 1632930177 -7200 # Node ID 571dd808c6c8c29f16b32ff035e4141c4f1b0011 # Parent e0d566f3ffce92ff66bae7c3ff2b7cf17f68e2b2 dirstate-item: use `maybe_clean` instead of `state` in record Differential Revision: https://phab.mercurial-scm.org/D11537 diff -r e0d566f3ffce -r 571dd808c6c8 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed Sep 29 15:40:13 2021 +0200 +++ b/mercurial/cmdutil.py Wed Sep 29 17:42:57 2021 +0200 @@ -626,7 +626,7 @@ for realname, tmpname in pycompat.iteritems(backups): ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) - if dirstate[realname] == b'n': + if dirstate.get_entry(realname).maybe_clean: # without normallookup, restoring timestamp # may cause partially committed files # to be treated as unmodified