Mercurial > evolve

diff CHANGELOG @ 3577:279d8b610ac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add a `--stop` flag for `hg evolve` command This patch adds a `--stop` flag for `hg evolve` command. The stop flag lets you stop the evolution from where you are and let you move to other things if you want. This fuctionality is great as user can decide to resolve conflicts later on, stop the command execution, do something else and get back once they has time or care about resolving them. As implementation details, it clears the evolvestate, updates to the parent of working directory clearing the uncommitted changes which also deletes the mergestate. A new test file test-evolve-stop.t is added with tests of the new flag added.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 20 Mar 2018 18:41:31 +0530
parents 6d03ec17c025
children 10c3e69bb5bf
line wrap: on
line diff
--- a/CHANGELOG	Mon Mar 19 15:20:40 2018 -0700
+++ b/CHANGELOG	Tue Mar 20 18:41:31 2018 +0530
@@ -10,6 +10,7 @@
   * evolve: `--continue` flag now continue evolving all the remaining revisions
   * prev and next now prompts user to choose a changeset in case of ambiguity
     when ui.interactive is turned on
+  * evolve: a new `--stop` flag which can be used to stop interrupted evolution
 
 7.2.2 -- (in-progress)
 ----------------------