equal
deleted
inserted
replaced
52 | o 1: 'B' |
52 | o 1: 'B' |
53 |/ |
53 |/ |
54 o 0: 'A' |
54 o 0: 'A' |
55 |
55 |
56 $ hg rebase --detach -s 3 -d 4 |
56 $ hg rebase --detach -s 3 -d 4 |
57 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
57 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
58 |
58 |
59 $ hg tglog |
59 $ hg tglog |
60 @ 4: 'D' |
60 @ 4: 'D' |
61 | |
61 | |
62 o 3: 'E' |
62 o 3: 'E' |
90 | o 1: 'B' |
90 | o 1: 'B' |
91 |/ |
91 |/ |
92 o 0: 'A' |
92 o 0: 'A' |
93 |
93 |
94 $ hg rebase --detach -s 2 -d 4 |
94 $ hg rebase --detach -s 2 -d 4 |
95 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
95 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
96 |
96 |
97 $ hg tglog |
97 $ hg tglog |
98 @ 4: 'D' |
98 @ 4: 'D' |
99 | |
99 | |
100 o 3: 'C' |
100 o 3: 'C' |
129 | o 1: 'B' |
129 | o 1: 'B' |
130 |/ |
130 |/ |
131 o 0: 'A' |
131 o 0: 'A' |
132 |
132 |
133 $ hg rebase --detach -s 1 -d 4 |
133 $ hg rebase --detach -s 1 -d 4 |
134 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
134 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
135 |
135 |
136 $ hg tglog |
136 $ hg tglog |
137 @ 4: 'D' |
137 @ 4: 'D' |
138 | |
138 | |
139 o 3: 'C' |
139 o 3: 'C' |
169 | o 1: 'B' |
169 | o 1: 'B' |
170 |/ |
170 |/ |
171 o 0: 'A' |
171 o 0: 'A' |
172 |
172 |
173 $ hg rebase --detach --collapse -s 2 -d 4 |
173 $ hg rebase --detach --collapse -s 2 -d 4 |
174 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) |
174 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
175 |
175 |
176 $ hg tglog |
176 $ hg tglog |
177 @ 3: 'Collapsed revision |
177 @ 3: 'Collapsed revision |
178 | * C |
178 | * C |
179 | * D' |
179 | * D' |