Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/mq.py
changeset 47717 d905eff405d1
parent 47697 c9e412712e0c
child 47733 4b7eb01db10b 
--- a/hgext/mq.py	Mon Jul 19 02:46:09 2021 +0200
+++ b/hgext/mq.py	Sun Jul 18 22:49:26 2021 +0200
@@ -1855,7 +1855,9 @@
                     for f in m + r:
                         fctx = ctx[f]
                         repo.wwrite(f, fctx.data(), fctx.flags())
-                        repo.dirstate.normal(f)
+                        repo.dirstate.update_file(
+                            f, p1_tracked=True, wc_tracked=True
+                        )
                     repo.setparents(qp, repo.nullid)
             for patch in reversed(self.applied[start:end]):
                 self.ui.status(_(b"popping %s\n") % patch.name)
@@ -2047,7 +2049,7 @@
                             mm.append(m[i])
                             del m[i]
                     for f in m:
-                        repo.dirstate.normal(f)
+                        repo.dirstate.update_file_p1(f, p1_tracked=True)
                     for f in mm:
                         repo.dirstate.normallookup(f)
                     for f in forget:
mercurial