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 |
591 [255] |
592 [255] |
592 $ hg fold 6 # want to run hg fold 6 |
593 $ hg fold 6 # want to run hg fold 6 |
593 2 changesets folded |
594 2 changesets folded |
594 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
595 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
595 $ glog |
596 $ glog |
596 @ 11:*@default(draft) add 1 (glob) |
597 @ 11:dd4682c1a481@default(draft) add 1 |
597 | |
598 | |
598 o 5:0b9e50c35132@default(draft) add 3 |
599 o 5:0b9e50c35132@default(draft) add 3 |
599 | |
600 | |
600 o 4:ce341209337f@default(draft) add 4 |
601 o 4:ce341209337f@default(draft) add 4 |
601 | |
602 | |
613 |
614 |
614 Test fold with wc parent is not the head of the folded revision |
615 Test fold with wc parent is not the head of the folded revision |
615 |
616 |
616 $ hg up 4 |
617 $ hg up 4 |
617 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
618 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
618 $ hg fold --rev 4::11 |
619 $ hg fold --rev 4::11 --user victor |
619 3 changesets folded |
620 3 changesets folded |
620 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
621 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
621 $ glog |
622 $ glog |
622 @ 12:*@default(draft) add 4 (glob) |
623 @ 12:d26d339c513f@default(draft) add 4 |
623 | |
624 | |
624 | o 1:73d38bb17fd7@default(draft) add 1 |
625 | o 1:73d38bb17fd7@default(draft) add 1 |
625 |/ |
626 |/ |
626 o 0:8685c6d34325@default(draft) add 0 |
627 o 0:8685c6d34325@default(draft) add 0 |
627 |
628 |
|
629 $ hg log --template '{rev}: {author}\n' |
|
630 12: victor |
|
631 1: test |
|
632 0: test |
628 $ hg log -r 12 --template '{desc}\n' |
633 $ hg log -r 12 --template '{desc}\n' |
629 add 4 |
634 add 4 |
630 |
635 |
631 |
636 |
632 add 3 |
637 add 3 |