diff -r 20d0149b8a0a -r 97c5d1c22489 mercurial/strip.py --- 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)