changeset 48100 | 571dd808c6c8 |
parent 47746 | 56297381af90 |
child 48102 | 304267b077de |
--- 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