# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1521889683 -19800 # Node ID 8db32b33cdf1b8867845a6bd7b30156c34ae3275 # Parent 2789c0ec2ad7e5db268d067e0c97a0b1bc139559 evolve: store the precursor of phase-divergent in evolvestate This patch makes `hg evolve` store the precursor of phase-divergent changeset in evolvestate so that we don't need to calculate that again. diff -r 2789c0ec2ad7 -r 8db32b33cdf1 hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Sat Mar 24 13:17:05 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Sat Mar 24 16:38:03 2018 +0530 @@ -254,6 +254,7 @@ rebasedbmupdate = _bookmarksupdater(repo, bumped.node(), tr) except MergeFailure: evolvestate['current'] = bumped.hex() + evolvestate['precursor'] = prec.hex() evolvestate.save() repo.ui.write_err(_('evolution failed!\n')) msg = _("fix conflict and run 'hg evolve --continue'\n")