changeset 48096:97c5d1c22489

dirstate-item: use `maybe_clean` instead of `state` in `strip` Differential Revision: https://phab.mercurial-scm.org/D11533
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 29 Sep 2021 15:23:57 +0200
parents 20d0149b8a0a
children d86875b75838
files mercurial/strip.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/strip.py	Wed Sep 29 15:07:21 2021 +0200
+++ b/mercurial/strip.py	Wed Sep 29 15:23:57 2021 +0200
@@ -255,7 +255,9 @@
 
             # reset files that only changed in the dirstate too
             dirstate = repo.dirstate
-            dirchanges = [f for f in dirstate if dirstate[f] != b'n']
+            dirchanges = [
+                f for f in dirstate if not dirstate.get_entry(f).maybe_clean
+            ]
             changedfiles.extend(dirchanges)
 
             repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)