Mercurial > evolve
diff tests/test-prev-next.t @ 1449:9be1cadf7a07
next: add a --evolve option
When on a topological head, this option will trigger the evolution of a unstable
changeset that will result in a children of the current working copy parent.
This should ease stacked changesets workflow by allowing to stick to prev and
next to move through a stack of diff, evolving part of it on demand when needed.
In case of ambiguity, the command will ask the user to choose. We need a better
definition of "the stack of changesets I'm working on" to be able to seamlessly
handling branching.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 24 Jun 2015 20:06:45 -0700 |
parents | 3c113c097339 |
children | ee5391999f2d |
line wrap: on
line diff
--- a/tests/test-prev-next.t Wed Jun 24 19:42:01 2015 -0700 +++ b/tests/test-prev-next.t Wed Jun 24 20:06:45 2015 -0700 @@ -147,12 +147,12 @@ 1 new unstable changesets $ hg next no children - (1 unstable changesets to be evolved here, do you want to evolve?) + (1 unstable changesets to be evolved here, do you want --evolve?) [1] - $ hg evolve + $ hg next --evolve move:[2] added c atop:[3] added b (2) - working directory is now at e3b6d5df389b + working directory now at e3b6d5df389b next with ambiguity @@ -179,12 +179,14 @@ 2 new unstable changesets $ hg next no children - (2 unstable changesets to be evolved here, do you want to evolve?) + (2 unstable changesets to be evolved here, do you want --evolve?) [1] - $ hg evolve - abort: multiple evolve candidates - (select one of e3b6d5df389b, 9df671ccd2c7 with --rev) - [255] + $ hg next --evolve + ambigious next (unstable) changeset: + [4] added c + [5] added d + (run "hg evolve --rev REV" on one of them) + [1] $ hg evolve -r 5 move:[5] added d atop:[6] added b (3)