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 |
480 merging bar |
481 merging bar |
481 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
482 warning: conflicts while merging bar! (edit, then use 'hg resolve --mark') |
482 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
483 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
483 use 'hg resolve' to retry unresolved file merges |
484 use 'hg resolve' to retry unresolved file merges |
484 [2] added bar |
485 [2] added bar |
|
486 |
|
487 Add test which shows that now `next` command does not get confused by split: |
|
488 ---------------------------------------------------------------------------- |
|
489 $ cd .. |
|
490 $ mkdir nextconfused |
|
491 $ cd nextconfused |
|
492 $ hg init |
|
493 $ echo firstline > a |
|
494 $ hg add a |
|
495 $ hg ci -qm A |
|
496 $ echo bbbbb > b |
|
497 $ echo secondline >> a |
|
498 $ hg add b |
|
499 $ hg ci -qm B |
|
500 $ echo ccccc > c |
|
501 $ hg add c |
|
502 $ hg ci -qm C |
|
503 $ hg log -GT "{rev}:{node|short} {desc}\n" |
|
504 @ 2:fdc998261dcb C |
|
505 | |
|
506 o 1:cc0edb0cc2b1 B |
|
507 | |
|
508 o 0:cae96ff49c84 A |
|
509 |
|
510 $ hg up 1 |
|
511 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
512 $ hg split << EOF |
|
513 > y |
|
514 > y |
|
515 > n |
|
516 > Y |
|
517 > y |
|
518 > y |
|
519 > EOF |
|
520 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
521 reverting a |
|
522 adding b |
|
523 diff --git a/a b/a |
|
524 1 hunks, 1 lines changed |
|
525 examine changes to 'a'? [Ynesfdaq?] y |
|
526 |
|
527 @@ -1,1 +1,2 @@ |
|
528 firstline |
|
529 +secondline |
|
530 record change 1/2 to 'a'? [Ynesfdaq?] y |
|
531 |
|
532 diff --git a/b b/b |
|
533 new file mode 100644 |
|
534 examine changes to 'b'? [Ynesfdaq?] n |
|
535 |
|
536 created new head |
|
537 continue splitting? [Ycdq?] Y |
|
538 diff --git a/b b/b |
|
539 new file mode 100644 |
|
540 examine changes to 'b'? [Ynesfdaq?] y |
|
541 |
|
542 @@ -0,0 +1,1 @@ |
|
543 +bbbbb |
|
544 record this change to 'b'? [Ynesfdaq?] y |
|
545 |
|
546 no more change to split |
|
547 1 new orphan changesets |
|
548 |
|
549 $ hg up 3 -q |
|
550 $ hg log -GT "{rev}:{node|short} {desc}\n" |
|
551 o 4:279f6cab32b5 B |
|
552 | |
|
553 | |
|
554 | new desc |
|
555 @ 3:a9f74d07e45c B |
|
556 | |
|
557 | |
|
558 | new desc |
|
559 | * 2:fdc998261dcb C |
|
560 | | |
|
561 | x 1:cc0edb0cc2b1 B |
|
562 |/ |
|
563 o 0:cae96ff49c84 A |
|
564 |
|
565 $ hg ci --amend -m "B modified" |
|
566 1 new orphan changesets |
|
567 $ hg log -GT "{rev}:{node|short} {desc}\n" |
|
568 @ 5:64ab03d3110c B modified |
|
569 | |
|
570 | * 4:279f6cab32b5 B |
|
571 | | |
|
572 | | |
|
573 | | new desc |
|
574 | x 3:a9f74d07e45c B |
|
575 |/ |
|
576 | |
|
577 | new desc |
|
578 | * 2:fdc998261dcb C |
|
579 | | |
|
580 | x 1:cc0edb0cc2b1 B |
|
581 |/ |
|
582 o 0:cae96ff49c84 A |
|
583 |
|
584 $ hg next --evolve << EOF |
|
585 > q |
|
586 > EOF |
|
587 move:[4] B |
|
588 atop:[5] B modified |
|
589 working directory now at 1b434459c7e7 |