--- a/mercurial/context.py	Mon Jul 19 01:44:24 2021 +0200
+++ b/mercurial/context.py	Mon Jul 19 03:15:57 2021 +0200
@@ -2022,7 +2022,9 @@
     def markcommitted(self, node):
         with self._repo.dirstate.parentchange():
             for f in self.modified() + self.added():
-                self._repo.dirstate.normal(f)
+                self._repo.dirstate.update_file(
+                    f, p1_tracked=True, wc_tracked=True
+                )
             for f in self.removed():
                 self._repo.dirstate.drop(f)
             self._repo.dirstate.setparents(node)