Mercurial > evolve

changeset 3756:26b9b89f8dac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: store a list of temprevs in evolvestate There are temporary revisions which are created as a part of divergence resolution which needs to be stripped off if user runs `hg evolve --abort`. We need to save the nodeids of those temporary revisions in the evolvestate. The temprevs list will help in the above mentioned use cases.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 23 May 2018 02:43:23 +0530
parents a19703c6d2bb
children 2bc60fcac354
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Wed May 23 02:36:14 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Wed May 23 02:43:23 2018 +0530
@@ -1275,7 +1275,7 @@
                      'revs': list(revs), 'confirm': confirmopt,
                      'startnode': startnode.node(), 'skippedrevs': [],
                      'command': 'evolve', 'orphanmerge': False,
-                     'bookmarkchanges': []}
+                     'bookmarkchanges': [], 'temprevs': []}
         evolvestate.addopts(stateopts)
         for rev in revs:
             curctx = repo[rev]