Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | 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 `strip`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 29 Sep 2021 15:23:57 +0200
changeset 48096 97c5d1c22489
parent 48095 20d0149b8a0a
child 48097 d86875b75838
dirstate-item: use `maybe_clean` instead of `state` in `strip` Differential Revision: https://phab.mercurial-scm.org/D11533
mercurial/strip.py file | annotate | diff | comparison | revisions 
--- 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)
Mercurial