equal
deleted
inserted
replaced
179 [1] added b |
179 [1] added b |
180 |
180 |
181 some aspiring children |
181 some aspiring children |
182 |
182 |
183 $ hg amend -m 'added b (2)' |
183 $ hg amend -m 'added b (2)' |
184 1 new orphan changesets |
184 1 new unstable changesets |
185 $ hg next |
185 $ hg next |
186 no children |
186 no children |
187 (1 unstable changesets to be evolved here, do you want --evolve?) |
187 (1 unstable changesets to be evolved here, do you want --evolve?) |
188 [1] |
188 [1] |
189 $ hg next --evolve --dry-run |
189 $ hg next --evolve --dry-run |
219 [1] |
219 [1] |
220 |
220 |
221 next with ambiguity in aspiring children |
221 next with ambiguity in aspiring children |
222 |
222 |
223 $ hg am -m 'added b (3)' |
223 $ hg am -m 'added b (3)' |
224 2 new orphan changesets |
224 2 new unstable changesets |
225 $ hg next |
225 $ hg next |
226 no children |
226 no children |
227 (2 unstable changesets to be evolved here, do you want --evolve?) |
227 (2 unstable changesets to be evolved here, do you want --evolve?) |
228 [1] |
228 [1] |
229 $ hg next --evolve |
229 $ hg next --evolve |
261 |
261 |
262 $ hg amend --edit & |
262 $ hg amend --edit & |
263 $ sleep 1 |
263 $ sleep 1 |
264 $ hg next --evolve |
264 $ hg next --evolve |
265 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
265 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
266 1 new orphan changesets |
266 1 new unstable changesets |
267 got lock after [4-6] seconds (re) |
267 got lock after [4-6] seconds (re) |
268 move:[2] two |
268 move:[2] two |
269 atop:[3] one |
269 atop:[3] one |
270 working directory now at a7d885c75614 |
270 working directory now at a7d885c75614 |
271 $ wait |
271 $ wait |