# HG changeset patch # User Pierre-Yves David # Date 1446221077 0 # Node ID 9729fdcc1fab854f8e9880833a98dd898fb2b77b # Parent 324cd13838f10ce74d6ff4fa988d301ebc135150 prune: have dirstate collaborate with transaction With 3.6, dirstate update can work with transaction to ensure proper rollback. We do it if the mercurial version permit it. diff -r 324cd13838f1 -r 9729fdcc1fab hgext/evolve.py --- a/hgext/evolve.py Fri Oct 30 16:04:19 2015 +0000 +++ b/hgext/evolve.py Fri Oct 30 16:04:37 2015 +0000 @@ -2328,7 +2328,7 @@ dirchanges = [f for f in dirstate if dirstate[f] != 'n'] changedfiles.extend(dirchanges) repo.dirstate.rebuild(newnode.node(), newnode.manifest(), changedfiles) - repo.dirstate.write() + writedirstate(dirstate, tr) else: bookactive = bmactive(repo) # Active bookmark that we don't want to delete (with -B option)