equal
deleted
inserted
replaced
1 $ cat >> $HGRCPATH <<EOF |
1 $ cat >> $HGRCPATH <<EOF |
2 > [defaults] |
2 > [defaults] |
3 > amend=-d "0 0" |
3 > amend=-d "0 0" |
|
4 > fold=-d "0 0" |
4 > [web] |
5 > [web] |
5 > push_ssl = false |
6 > push_ssl = false |
6 > allow_push = * |
7 > allow_push = * |
7 > [phases] |
8 > [phases] |
8 > publish = False |
9 > publish = False |
598 [255] |
599 [255] |
599 $ hg fold 6 # want to run hg fold 6 |
600 $ hg fold 6 # want to run hg fold 6 |
600 2 changesets folded |
601 2 changesets folded |
601 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
602 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
602 $ glog |
603 $ glog |
603 @ 11:*@default(draft) add 1 (glob) |
604 @ 11:dd4682c1a481@default(draft) add 1 |
604 | |
605 | |
605 o 5:0b9e50c35132@default(draft) add 3 |
606 o 5:0b9e50c35132@default(draft) add 3 |
606 | |
607 | |
607 o 4:ce341209337f@default(draft) add 4 |
608 o 4:ce341209337f@default(draft) add 4 |
608 | |
609 | |
620 |
621 |
621 Test fold with wc parent is not the head of the folded revision |
622 Test fold with wc parent is not the head of the folded revision |
622 |
623 |
623 $ hg up 4 |
624 $ hg up 4 |
624 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
625 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
625 $ hg fold --rev 4::11 |
626 $ hg fold --rev 4::11 --user victor |
626 3 changesets folded |
627 3 changesets folded |
627 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
628 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
628 $ glog |
629 $ glog |
629 @ 12:*@default(draft) add 4 (glob) |
630 @ 12:d26d339c513f@default(draft) add 4 |
630 | |
631 | |
631 | o 1:73d38bb17fd7@default(draft) add 1 |
632 | o 1:73d38bb17fd7@default(draft) add 1 |
632 |/ |
633 |/ |
633 o 0:8685c6d34325@default(draft) add 0 |
634 o 0:8685c6d34325@default(draft) add 0 |
634 |
635 |
|
636 $ hg log --template '{rev}: {author}\n' |
|
637 12: victor |
|
638 1: test |
|
639 0: test |
635 $ hg log -r 12 --template '{desc}\n' |
640 $ hg log -r 12 --template '{desc}\n' |
636 add 4 |
641 add 4 |
637 |
642 |
638 |
643 |
639 add 3 |
644 add 3 |