Skip to content
Snippets Groups Projects
Commit a1f10edc authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

strip: access bookmark before getting a reference to changelog

Bookmark access might invalidate the current changelog (to make sure both are in
a reasonable synchronisation state). So we should grab the reference to
changelog after we access bookmark. Otherwise we risk using a dead object for
the whole strip process.

(note: this dead object business probably requires a new layers of checking)
parent 90d8a2a4
No related branches found
No related tags found
No related merge requests found
......@@ -109,6 +109,9 @@
repo = repo.unfiltered()
repo.destroying()
vfs = repo.vfs
# load bookmark before changelog to avoid side effect from outdated
# changelog (see repo._refreshchangelog)
repo._bookmarks
cl = repo.changelog
# TODO handle undo of merge sets
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment