Mercurial > evolve

comparison tests/test-prev-next.t @ 1449:9be1cadf7a07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
1448:3c113c097339 1449:9be1cadf7a07
145 145
146 $ hg amend -m 'added b (2)' 146 $ hg amend -m 'added b (2)'
147 1 new unstable changesets 147 1 new unstable changesets
148 $ hg next 148 $ hg next
149 no children 149 no children
150 (1 unstable changesets to be evolved here, do you want to evolve?) 150 (1 unstable changesets to be evolved here, do you want --evolve?)
151 [1] 151 [1]
152 $ hg evolve 152 $ hg next --evolve
153 move:[2] added c 153 move:[2] added c
154 atop:[3] added b (2) 154 atop:[3] added b (2)
155 working directory is now at e3b6d5df389b 155 working directory now at e3b6d5df389b
156 156
157 next with ambiguity 157 next with ambiguity
158 158
159 $ hg prev 159 $ hg prev
160 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 160 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
177 177
178 $ hg am -m 'added b (3)' 178 $ hg am -m 'added b (3)'
179 2 new unstable changesets 179 2 new unstable changesets
180 $ hg next 180 $ hg next
181 no children 181 no children
182 (2 unstable changesets to be evolved here, do you want to evolve?) 182 (2 unstable changesets to be evolved here, do you want --evolve?)
183 [1] 183 [1]
184 $ hg evolve 184 $ hg next --evolve
185 abort: multiple evolve candidates 185 ambigious next (unstable) changeset:
186 (select one of e3b6d5df389b, 9df671ccd2c7 with --rev) 186 [4] added c
187 [255] 187 [5] added d
188 (run "hg evolve --rev REV" on one of them)
189 [1]
188 $ hg evolve -r 5 190 $ hg evolve -r 5
189 move:[5] added d 191 move:[5] added d
190 atop:[6] added b (3) 192 atop:[6] added b (3)
191 working directory is now at 47ea25be8aea 193 working directory is now at 47ea25be8aea