Mercurial > evolve

changeset 3631:8db32b33cdf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 24 Mar 2018 16:38:03 +0530
parents 2789c0ec2ad7
children 8d38b88233cb
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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")