Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorPulkit Goyal <7895pulkit@gmail.com>
Sat, 24 Mar 2018 16:38:03 +0530
changeset 3631 8db32b33cdf1
parent 3630 2789c0ec2ad7
child 3632 8d38b88233cb
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.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- 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")
evolve