Mercurial > evolve
comparison CHANGELOG @ 3577:279d8b610ac5
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 |
comparison
equal
deleted
inserted
replaced
| 3576:89acae8f7e93 | 3577:279d8b610ac5 |
|---|---|
| 8 and update to it | 8 and update to it |
| 9 * resolve: shows how to continue evolve after resolving all conflicts | 9 * resolve: shows how to continue evolve after resolving all conflicts |
| 10 * evolve: `--continue` flag now continue evolving all the remaining revisions | 10 * evolve: `--continue` flag now continue evolving all the remaining revisions |
| 11 * prev and next now prompts user to choose a changeset in case of ambiguity | 11 * prev and next now prompts user to choose a changeset in case of ambiguity |
| 12 when ui.interactive is turned on | 12 when ui.interactive is turned on |
| 13 * evolve: a new `--stop` flag which can be used to stop interrupted evolution | |
| 13 | 14 |
| 14 7.2.2 -- (in-progress) | 15 7.2.2 -- (in-progress) |
| 15 ---------------------- | 16 ---------------------- |
| 16 | 17 |
| 17 * fold: fix issue related to bookmarks movement (issue5772) | 18 * fold: fix issue related to bookmarks movement (issue5772) |