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 evolvestate file when encountering conflicts
authorPulkit Goyal <7895pulkit@gmail.com>
Sun, 29 Apr 2018 18:48:36 +0530
changeset 3736 4b8c63d14f18
parent 3735 bdf7fb6af7b8
child 3737 5b0bd82ea914
evolve: store the evolvestate file when encountering conflicts This patch makes `hg evolve` store the evolvestate file when it encounters merge conflicts while resolving content-divergence.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 18:13:29 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 18:48:36 2018 +0530
@@ -417,6 +417,7 @@
     if compat.hasconflict(stats):
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                          "or 'hg update -C .' to abort\n"))
+        evolvestate.save()
         raise error.Abort('merge conflict between several amendments '
                           '(this is not automated yet)',
                           hint="""/!\ You can try:
evolve