equal
deleted
inserted
replaced
182 |
182 |
183 some aspiring children |
183 some aspiring children |
184 |
184 |
185 $ hg amend -m 'added b (2)' |
185 $ hg amend -m 'added b (2)' |
186 1 new orphan changesets |
186 1 new orphan changesets |
187 $ hg next |
187 $ hg next --no-evolve |
188 no children |
188 no children |
189 (1 unstable changesets to be evolved here, do you want --evolve?) |
189 (1 unstable changesets to be evolved here, do you want --evolve?) |
190 [1] |
190 [1] |
191 $ hg next --evolve --dry-run |
191 $ hg next --evolve --dry-run |
192 move:[2] added c |
192 move:[2] added c |
229 |
229 |
230 next with ambiguity in aspiring children |
230 next with ambiguity in aspiring children |
231 |
231 |
232 $ hg am -m 'added b (3)' |
232 $ hg am -m 'added b (3)' |
233 2 new orphan changesets |
233 2 new orphan changesets |
234 $ hg next |
234 $ hg next --no-evolve |
235 no children |
235 no children |
236 (2 unstable changesets to be evolved here, do you want --evolve?) |
236 (2 unstable changesets to be evolved here, do you want --evolve?) |
237 [1] |
237 [1] |
238 $ hg next --evolve <<EOF |
238 $ hg next --evolve <<EOF |
239 > 0 |
239 > 0 |