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.
mq: write the dirstate before stripping
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 16 Feb 2023 04:41:38 +0100
changeset 50080 2a46555c5522
parent 50079 acd2a0267660
child 50081 9a0778bbae6a
mq: write the dirstate before stripping I am not certain why it is dirty (probably the `repo.setparent` call a right before. However I know we need it flushed before the repository starts to be stripped.
hgext/mq.py file | annotate | diff | comparison | revisions 
--- a/hgext/mq.py	Thu Feb 16 03:08:00 2023 +0100
+++ b/hgext/mq.py	Thu Feb 16 04:41:38 2023 +0100
@@ -2048,6 +2048,7 @@
 
                 # assumes strip can roll itself back if interrupted
                 repo.setparents(*cparents)
+                repo.dirstate.write(repo.currenttransaction())
                 self.applied.pop()
                 self.applieddirty = True
                 strip(self.ui, repo, [top], update=False, backup=False)
Mercurial