Mercurial > hg

changeset 48100:571dd808c6c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: use `maybe_clean` instead of `state` in record Differential Revision: https://phab.mercurial-scm.org/D11537
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 29 Sep 2021 17:42:57 +0200
parents e0d566f3ffce
children 78e66649cdb3
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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