equal
deleted
inserted
replaced
181 [1] added b |
181 [1] added b |
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 |
|
187 $ hg next --no-evolve |
186 $ hg next --no-evolve |
188 no children |
187 no children |
189 (1 unstable changesets to be evolved here, do you want --evolve?) |
188 (1 unstable changesets to be evolved here, do you want --evolve?) |
190 [1] |
189 [1] |
191 $ hg next --evolve --dry-run |
190 $ hg next --evolve --dry-run |
228 [3] added b (2) |
227 [3] added b (2) |
229 |
228 |
230 next with ambiguity in aspiring children |
229 next with ambiguity in aspiring children |
231 |
230 |
232 $ hg am -m 'added b (3)' |
231 $ hg am -m 'added b (3)' |
233 2 new orphan changesets |
|
234 $ hg next --no-evolve |
232 $ hg next --no-evolve |
235 no children |
233 no children |
236 (2 unstable changesets to be evolved here, do you want --evolve?) |
234 (2 unstable changesets to be evolved here, do you want --evolve?) |
237 [1] |
235 [1] |
238 $ hg next --evolve <<EOF |
236 $ hg next --evolve <<EOF |
250 $ hg log -GT "{rev}:{node|short} {desc}\n" |
248 $ hg log -GT "{rev}:{node|short} {desc}\n" |
251 @ 7:5ce67c2407b0 added c |
249 @ 7:5ce67c2407b0 added c |
252 | |
250 | |
253 o 6:d7f119adc759 added b (3) |
251 o 6:d7f119adc759 added b (3) |
254 | |
252 | |
255 | * 5:9df671ccd2c7 added d |
253 | o 5:9df671ccd2c7 added d |
256 | | |
254 | | |
257 | x 3:9ad178109a19 added b (2) |
255 | x 3:9ad178109a19 added b (2) |
258 |/ |
256 |/ |
259 o 0:a154386e50d1 added a |
257 o 0:a154386e50d1 added a |
260 |
258 |
346 |
344 |
347 $ hg amend --edit & |
345 $ hg amend --edit & |
348 $ sleep 1 |
346 $ sleep 1 |
349 $ hg next --evolve |
347 $ hg next --evolve |
350 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
348 waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob) |
351 1 new orphan changesets |
|
352 got lock after [4-6] seconds (re) |
349 got lock after [4-6] seconds (re) |
353 move:[2] two |
350 move:[2] two |
354 atop:[3] one |
351 atop:[3] one |
355 working directory now at a7d885c75614 |
352 working directory now at a7d885c75614 |
356 $ wait |
353 $ wait |
367 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
364 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
368 |
365 |
369 $ echo foobar > bar |
366 $ echo foobar > bar |
370 $ hg add bar |
367 $ hg add bar |
371 $ hg amend |
368 $ hg amend |
372 1 new orphan changesets |
|
373 |
369 |
374 $ echo babar > bar |
370 $ echo babar > bar |
375 |
371 |
376 $ hg next --evolve |
372 $ hg next --evolve |
377 abort: uncommitted changes |
373 abort: uncommitted changes |
541 @@ -0,0 +1,1 @@ |
537 @@ -0,0 +1,1 @@ |
542 +bbbbb |
538 +bbbbb |
543 record this change to 'b'? [Ynesfdaq?] y |
539 record this change to 'b'? [Ynesfdaq?] y |
544 |
540 |
545 no more change to split |
541 no more change to split |
546 1 new orphan changesets |
|
547 |
542 |
548 $ hg up 3 -q |
543 $ hg up 3 -q |
549 $ hg log -GT "{rev}:{node|short} {desc}\n" |
544 $ hg log -GT "{rev}:{node|short} {desc}\n" |
550 o 4:279f6cab32b5 B |
545 o 4:279f6cab32b5 B |
551 | |
546 | |
553 | new desc |
548 | new desc |
554 @ 3:a9f74d07e45c B |
549 @ 3:a9f74d07e45c B |
555 | |
550 | |
556 | |
551 | |
557 | new desc |
552 | new desc |
558 | * 2:fdc998261dcb C |
553 | o 2:fdc998261dcb C |
559 | | |
554 | | |
560 | x 1:cc0edb0cc2b1 B |
555 | x 1:cc0edb0cc2b1 B |
561 |/ |
556 |/ |
562 o 0:cae96ff49c84 A |
557 o 0:cae96ff49c84 A |
563 |
558 |
564 $ hg ci --amend -m "B modified" |
559 $ hg ci --amend -m "B modified" |
565 1 new orphan changesets |
|
566 $ hg log -GT "{rev}:{node|short} {desc}\n" |
560 $ hg log -GT "{rev}:{node|short} {desc}\n" |
567 @ 5:64ab03d3110c B modified |
561 @ 5:64ab03d3110c B modified |
568 | |
562 | |
569 | * 4:279f6cab32b5 B |
563 | o 4:279f6cab32b5 B |
570 | | |
564 | | |
571 | | |
565 | | |
572 | | new desc |
566 | | new desc |
573 | x 3:a9f74d07e45c B |
567 | x 3:a9f74d07e45c B |
574 |/ |
568 |/ |
575 | |
569 | |
576 | new desc |
570 | new desc |
577 | * 2:fdc998261dcb C |
571 | o 2:fdc998261dcb C |
578 | | |
572 | | |
579 | x 1:cc0edb0cc2b1 B |
573 | x 1:cc0edb0cc2b1 B |
580 |/ |
574 |/ |
581 o 0:cae96ff49c84 A |
575 o 0:cae96ff49c84 A |
582 |
576 |