equal
deleted
inserted
replaced
50 $ hg phase --force --secret 3 |
50 $ hg phase --force --secret 3 |
51 $ hg rebase -s 3 -d 7 |
51 $ hg rebase -s 3 -d 7 |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob) |
53 |
53 |
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
55 @ 7:secret 'D' |
55 o 7:secret 'D' |
56 | |
56 | |
57 o 6:draft 'H' |
57 @ 6:draft 'H' |
58 | |
58 | |
59 | o 5:draft 'G' |
59 | o 5:draft 'G' |
60 |/| |
60 |/| |
61 o | 4:draft 'F' |
61 o | 4:draft 'F' |
62 | | |
62 | | |
101 |
101 |
102 $ hg rebase -s 2 -d 7 |
102 $ hg rebase -s 2 -d 7 |
103 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
103 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob) |
104 |
104 |
105 $ hg tglog |
105 $ hg tglog |
106 @ 7: 'D' |
106 o 7: 'D' |
107 | |
107 | |
108 o 6: 'C' |
108 o 6: 'C' |
109 | |
109 | |
110 o 5: 'H' |
110 @ 5: 'H' |
111 | |
111 | |
112 | o 4: 'G' |
112 | o 4: 'G' |
113 |/| |
113 |/| |
114 o | 3: 'F' |
114 o | 3: 'F' |
115 | | |
115 | | |
153 |
153 |
154 $ hg rebase -s 1 -d 7 |
154 $ hg rebase -s 1 -d 7 |
155 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
155 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob) |
156 |
156 |
157 $ hg tglog |
157 $ hg tglog |
158 @ 7: 'D' |
158 o 7: 'D' |
159 | |
159 | |
160 o 6: 'C' |
160 o 6: 'C' |
161 | |
161 | |
162 o 5: 'B' |
162 o 5: 'B' |
163 | |
163 | |
164 o 4: 'H' |
164 @ 4: 'H' |
165 | |
165 | |
166 | o 3: 'G' |
166 | o 3: 'G' |
167 |/| |
167 |/| |
168 o | 2: 'F' |
168 o | 2: 'F' |
169 | | |
169 | | |
207 |
207 |
208 $ hg rebase --collapse -s 2 -d 7 |
208 $ hg rebase --collapse -s 2 -d 7 |
209 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
209 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/*-backup.hg (glob) |
210 |
210 |
211 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
211 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
212 @ 6:secret 'Collapsed revision |
212 o 6:secret 'Collapsed revision |
213 | * C |
213 | * C |
214 | * D' |
214 | * D' |
215 o 5:draft 'H' |
215 @ 5:draft 'H' |
216 | |
216 | |
217 | o 4:draft 'G' |
217 | o 4:draft 'G' |
218 |/| |
218 |/| |
219 o | 3:draft 'F' |
219 o | 3:draft 'F' |
220 | | |
220 | | |
266 |
266 |
267 $ hg rebase -s 1 -d tip |
267 $ hg rebase -s 1 -d tip |
268 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
268 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob) |
269 |
269 |
270 $ hg tglog |
270 $ hg tglog |
271 @ 8: 'D' |
271 o 8: 'D' |
272 | |
272 | |
273 o 7: 'C' |
273 o 7: 'C' |
274 | |
274 | |
275 o 6: 'B' |
275 o 6: 'B' |
276 | |
276 | |
277 o 5: 'extra branch' |
277 @ 5: 'extra branch' |
278 |
278 |
279 o 4: 'H' |
279 o 4: 'H' |
280 | |
280 | |
281 | o 3: 'G' |
281 | o 3: 'G' |
282 |/| |
282 |/| |
288 |
288 |
289 |
289 |
290 $ hg rebase -d 5 -s 7 |
290 $ hg rebase -d 5 -s 7 |
291 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
291 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
292 $ hg tglog |
292 $ hg tglog |
293 @ 8: 'D' |
293 o 8: 'D' |
294 | |
294 | |
295 o 7: 'C' |
295 o 7: 'C' |
296 | |
296 | |
297 | o 6: 'B' |
297 | o 6: 'B' |
298 |/ |
298 |/ |
299 o 5: 'extra branch' |
299 @ 5: 'extra branch' |
300 |
300 |
301 o 4: 'H' |
301 o 4: 'H' |
302 | |
302 | |
303 | o 3: 'G' |
303 | o 3: 'G' |
304 |/| |
304 |/| |
327 |
327 |
328 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
328 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
329 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
329 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/*-backup.hg (glob) |
330 |
330 |
331 $ hg tglog |
331 $ hg tglog |
332 @ 8: 'Collapsed revision |
332 o 8: 'Collapsed revision |
333 | * I |
333 | * I |
334 | * Merge |
334 | * Merge |
335 | * J' |
335 | * J' |
336 o 7: 'H' |
336 @ 7: 'H' |
337 | |
337 | |
338 | o 6: 'G' |
338 | o 6: 'G' |
339 |/| |
339 |/| |
340 o | 5: 'F' |
340 o | 5: 'F' |
341 | | |
341 | | |