##// END OF EJS Templates
context: use `update_file` instead of `normal` in `markcommitted`...
marmoute -
r48506:5bbf3042 default
parent child Browse files
Show More
@@ -2022,7 +2022,9 b' class workingctx(committablectx):'
2022 def markcommitted(self, node):
2022 def markcommitted(self, node):
2023 with self._repo.dirstate.parentchange():
2023 with self._repo.dirstate.parentchange():
2024 for f in self.modified() + self.added():
2024 for f in self.modified() + self.added():
2025 self._repo.dirstate.normal(f)
2025 self._repo.dirstate.update_file(
2026 f, p1_tracked=True, wc_tracked=True
2027 )
2026 for f in self.removed():
2028 for f in self.removed():
2027 self._repo.dirstate.drop(f)
2029 self._repo.dirstate.drop(f)
2028 self._repo.dirstate.setparents(node)
2030 self._repo.dirstate.setparents(node)
General Comments 0
You need to be logged in to leave comments. Login now