483 o 0: 1994f17a630e 'A' |
483 o 0: 1994f17a630e 'A' |
484 |
484 |
485 $ hg rebase --keepbranches --collapse -s 1 -d 3 |
485 $ hg rebase --keepbranches --collapse -s 1 -d 3 |
486 abort: cannot collapse multiple named branches |
486 abort: cannot collapse multiple named branches |
487 [255] |
487 [255] |
488 |
|
489 $ repeatchange() { |
|
490 > hg checkout $1 |
|
491 > hg cp d z |
|
492 > echo blah >> z |
|
493 > hg commit -Am "$2" --user "$3" |
|
494 > } |
|
495 $ repeatchange 3 "E" "user1" |
|
496 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
497 $ repeatchange 3 "E" "user2" |
|
498 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
499 created new head |
|
500 $ hg tglog |
|
501 @ 5: fbfb97b1089a 'E' |
|
502 | |
|
503 | o 4: f338eb3c2c7c 'E' |
|
504 |/ |
|
505 o 3: 41acb9dca9eb 'D' |
|
506 | |
|
507 | o 2: 8ac4a08debf1 'C' two |
|
508 | | |
|
509 | o 1: 1ba175478953 'B' one |
|
510 |/ |
|
511 o 0: 1994f17a630e 'A' |
|
512 |
|
513 $ hg rebase -s 5 -d 4 |
|
514 rebasing 5:fbfb97b1089a "E" (tip) |
|
515 note: not rebasing 5:fbfb97b1089a "E" (tip), its destination already has all its changes |
|
516 saved backup bundle to $TESTTMP/e/.hg/strip-backup/fbfb97b1089a-553e1d85-rebase.hg |
|
517 $ hg tglog |
|
518 @ 4: f338eb3c2c7c 'E' |
|
519 | |
|
520 o 3: 41acb9dca9eb 'D' |
|
521 | |
|
522 | o 2: 8ac4a08debf1 'C' two |
|
523 | | |
|
524 | o 1: 1ba175478953 'B' one |
|
525 |/ |
|
526 o 0: 1994f17a630e 'A' |
|
527 |
|
528 $ hg export tip |
|
529 # HG changeset patch |
|
530 # User user1 |
|
531 # Date 0 0 |
|
532 # Thu Jan 01 00:00:00 1970 +0000 |
|
533 # Node ID f338eb3c2c7cc5b5915676a2376ba7ac558c5213 |
|
534 # Parent 41acb9dca9eb976e84cd21fcb756b4afa5a35c09 |
|
535 E |
|
536 |
|
537 diff -r 41acb9dca9eb -r f338eb3c2c7c z |
|
538 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
539 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
|
540 @@ -0,0 +1,2 @@ |
|
541 +d |
|
542 +blah |
|
543 |
488 |
544 $ cd .. |
489 $ cd .. |
545 |
490 |
546 Rebase, collapse and copies |
491 Rebase, collapse and copies |
547 |
492 |