##// END OF EJS Templates
mq: wrap the dirstate's rebuild in a `changing_parents` context...
marmoute -
r51006:0ca8dc8a default
parent child Browse files
Show More
@@ -2121,9 +2121,9 b' class queue:'
2121 finally:
2121 finally:
2122 lockmod.release(tr, lock)
2122 lockmod.release(tr, lock)
2123 except: # re-raises
2123 except: # re-raises
2124 ctx = repo[cparents[0]]
2124 with repo.dirstate.changing_parents(repo):
2125 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2125 ctx = repo[cparents[0]]
2126 repo.dirstate.write(repo.currenttransaction())
2126 repo.dirstate.rebuild(ctx.node(), ctx.manifest())
2127 self.savedirty()
2127 self.savedirty()
2128 self.ui.warn(
2128 self.ui.warn(
2129 _(
2129 _(
General Comments 0
You need to be logged in to leave comments. Login now