equal
deleted
inserted
replaced
196 (add color output for smoke testing) |
196 (add color output for smoke testing) |
197 |
197 |
198 $ hg next --evolve --color debug |
198 $ hg next --evolve --color debug |
199 [evolve.operation|move:][[evolve.rev|2]] added c |
199 [evolve.operation|move:][[evolve.rev|2]] added c |
200 atop:[[evolve.rev|3]] added b (2) |
200 atop:[[evolve.rev|3]] added b (2) |
201 [ ui.status|working directory now at [evolve.node|e3b6d5df389b]] |
201 [ ui.status|working directory is now at [evolve.node|e3b6d5df389b]] |
202 |
202 |
203 next with ambiguity |
203 next with ambiguity |
204 |
204 |
205 $ hg prev |
205 $ hg prev |
206 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
206 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
243 2: [9df671ccd2c7] added d |
243 2: [9df671ccd2c7] added d |
244 q: quit the prompt |
244 q: quit the prompt |
245 enter the index of the revision you want to select: 1 |
245 enter the index of the revision you want to select: 1 |
246 move:[4] added c |
246 move:[4] added c |
247 atop:[6] added b (3) |
247 atop:[6] added b (3) |
248 working directory now at 5ce67c2407b0 |
248 working directory is now at 5ce67c2407b0 |
249 |
249 |
250 $ hg log -GT "{rev}:{node|short} {desc}\n" |
250 $ hg log -GT "{rev}:{node|short} {desc}\n" |
251 @ 7:5ce67c2407b0 added c |
251 @ 7:5ce67c2407b0 added c |
252 | |
252 | |
253 o 6:d7f119adc759 added b (3) |
253 o 6:d7f119adc759 added b (3) |
350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
351 1 new orphan changesets |
351 1 new orphan changesets |
352 got lock after (\d+) seconds (re) |
352 got lock after (\d+) seconds (re) |
353 move:[2] two |
353 move:[2] two |
354 atop:[3] one |
354 atop:[3] one |
355 working directory now at a7d885c75614 |
355 working directory is now at a7d885c75614 |
356 $ wait |
356 $ wait |
357 |
357 |
358 testing next --evolve when working directory is dirty |
358 testing next --evolve when working directory is dirty |
359 |
359 |
360 $ hg log -GT "{rev}:{node|short} {desc|firstline}" |
360 $ hg log -GT "{rev}:{node|short} {desc|firstline}" |
596 $ hg next --evolve << EOF |
596 $ hg next --evolve << EOF |
597 > q |
597 > q |
598 > EOF |
598 > EOF |
599 move:[4] B |
599 move:[4] B |
600 atop:[5] B modified |
600 atop:[5] B modified |
601 working directory now at 1b434459c7e7 |
601 working directory is now at 1b434459c7e7 |