equal
deleted
inserted
replaced
556 |
556 |
557 $ rm *.orig |
557 $ rm *.orig |
558 $ hg fold |
558 $ hg fold |
559 no revision to fold |
559 no revision to fold |
560 [1] |
560 [1] |
561 $ hg fold 6::10 |
561 $ hg fold 6 --rev 10 |
|
562 abort: cannot specify both --rev and a target revision |
|
563 [255] |
|
564 $ hg fold 6 # want to run hg fold 6 |
562 2 changesets folded |
565 2 changesets folded |
563 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
566 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
564 $ glog |
567 $ glog |
565 @ 11:*@default(draft) add 1 (glob) |
568 @ 11:*@default(draft) add 1 (glob) |
566 | |
569 | |
582 |
585 |
583 Test fold with wc parent is not the head of the folded revision |
586 Test fold with wc parent is not the head of the folded revision |
584 |
587 |
585 $ hg up 4 |
588 $ hg up 4 |
586 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
589 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
587 $ hg fold 4::11 |
590 $ hg fold --rev 4::11 |
588 3 changesets folded |
591 3 changesets folded |
589 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
592 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
590 $ glog |
593 $ glog |
591 @ 12:*@default(draft) add 4 (glob) |
594 @ 12:*@default(draft) add 4 (glob) |
592 | |
595 | |