equal
deleted
inserted
replaced
50 $ hg clone -q -u 3 a a1 |
50 $ hg clone -q -u 3 a a1 |
51 $ cd a1 |
51 $ cd a1 |
52 |
52 |
53 $ hg phase --force --secret 3 |
53 $ hg phase --force --secret 3 |
54 |
54 |
55 $ hg rebase --collapse --keepbranches |
55 $ cat > $TESTTMP/editor.sh <<EOF |
|
56 > echo "==== before editing" |
|
57 > cat \$1 |
|
58 > echo "====" |
|
59 > echo "edited manually" >> \$1 |
|
60 > EOF |
|
61 $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e |
|
62 ==== before editing |
|
63 Collapsed revision |
|
64 * B |
|
65 * C |
|
66 * D |
|
67 |
|
68 |
|
69 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
70 HG: Leave message empty to abort commit. |
|
71 HG: -- |
|
72 HG: user: Nicolas Dumazet <nicdumz.commits@gmail.com> |
|
73 HG: branch 'default' |
|
74 HG: changed B |
|
75 HG: changed C |
|
76 HG: changed D |
|
77 ==== |
56 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
78 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
57 |
79 |
58 $ hg tglogp |
80 $ hg tglogp |
59 @ 5:secret 'Collapsed revision |
81 @ 5:secret 'Collapsed revision |
60 | * B |
82 | * B |
61 | * C |
83 | * C |
62 | * D' |
84 | * D |
|
85 | |
|
86 | |
|
87 | edited manually' |
63 o 4:draft 'H' |
88 o 4:draft 'H' |
64 | |
89 | |
65 | o 3:draft 'G' |
90 | o 3:draft 'G' |
66 |/| |
91 |/| |
67 o | 2:draft 'F' |
92 o | 2:draft 'F' |