Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 29 Sep 2021 17:42:57 +0200
changeset 48100 571dd808c6c8
parent 48099 e0d566f3ffce
child 48101 78e66649cdb3
dirstate-item: use `maybe_clean` instead of `state` in record Differential Revision: https://phab.mercurial-scm.org/D11537
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- 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
mercurial