equal
deleted
inserted
replaced
47 o 0: 'A' |
47 o 0: 'A' |
48 |
48 |
49 $ hg phase --force --secret 3 |
49 $ hg phase --force --secret 3 |
50 $ hg rebase -s 3 -d 7 |
50 $ hg rebase -s 3 -d 7 |
51 rebasing 3:32af7686d403 "D" |
51 rebasing 3:32af7686d403 "D" |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-backup.hg (glob) |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.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 o 7:secret 'D' |
55 o 7:secret 'D' |
56 | |
56 | |
57 @ 6:draft 'H' |
57 @ 6:draft 'H' |
100 o 0: 'A' |
100 o 0: 'A' |
101 |
101 |
102 $ hg rebase -s 2 -d 7 |
102 $ hg rebase -s 2 -d 7 |
103 rebasing 2:5fddd98957c8 "C" |
103 rebasing 2:5fddd98957c8 "C" |
104 rebasing 3:32af7686d403 "D" |
104 rebasing 3:32af7686d403 "D" |
105 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
105 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
106 |
106 |
107 $ hg tglog |
107 $ hg tglog |
108 o 7: 'D' |
108 o 7: 'D' |
109 | |
109 | |
110 o 6: 'C' |
110 o 6: 'C' |
155 |
155 |
156 $ hg rebase -s 1 -d 7 |
156 $ hg rebase -s 1 -d 7 |
157 rebasing 1:42ccdea3bb16 "B" |
157 rebasing 1:42ccdea3bb16 "B" |
158 rebasing 2:5fddd98957c8 "C" |
158 rebasing 2:5fddd98957c8 "C" |
159 rebasing 3:32af7686d403 "D" |
159 rebasing 3:32af7686d403 "D" |
160 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
160 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
161 |
161 |
162 $ hg tglog |
162 $ hg tglog |
163 o 7: 'D' |
163 o 7: 'D' |
164 | |
164 | |
165 o 6: 'C' |
165 o 6: 'C' |
211 o 0: 'A' |
211 o 0: 'A' |
212 |
212 |
213 $ hg rebase --collapse -s 2 -d 7 |
213 $ hg rebase --collapse -s 2 -d 7 |
214 rebasing 2:5fddd98957c8 "C" |
214 rebasing 2:5fddd98957c8 "C" |
215 rebasing 3:32af7686d403 "D" |
215 rebasing 3:32af7686d403 "D" |
216 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-backup.hg (glob) |
216 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) |
217 |
217 |
218 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
218 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
219 o 6:secret 'Collapsed revision |
219 o 6:secret 'Collapsed revision |
220 | * C |
220 | * C |
221 | * D' |
221 | * D' |
273 |
273 |
274 $ hg rebase -s 1 -d tip |
274 $ hg rebase -s 1 -d tip |
275 rebasing 1:42ccdea3bb16 "B" |
275 rebasing 1:42ccdea3bb16 "B" |
276 rebasing 2:5fddd98957c8 "C" |
276 rebasing 2:5fddd98957c8 "C" |
277 rebasing 3:32af7686d403 "D" |
277 rebasing 3:32af7686d403 "D" |
278 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-backup.hg (glob) |
278 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) |
279 |
279 |
280 $ hg tglog |
280 $ hg tglog |
281 o 8: 'D' |
281 o 8: 'D' |
282 | |
282 | |
283 o 7: 'C' |
283 o 7: 'C' |
298 |
298 |
299 |
299 |
300 $ hg rebase -d 5 -s 7 |
300 $ hg rebase -d 5 -s 7 |
301 rebasing 7:13547172c9c0 "C" |
301 rebasing 7:13547172c9c0 "C" |
302 rebasing 8:4e27a76c371a "D" (tip) |
302 rebasing 8:4e27a76c371a "D" (tip) |
303 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-backup.hg (glob) |
303 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-rebase.hg (glob) |
304 $ hg tglog |
304 $ hg tglog |
305 o 8: 'D' |
305 o 8: 'D' |
306 | |
306 | |
307 o 7: 'C' |
307 o 7: 'C' |
308 | |
308 | |
339 |
339 |
340 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
340 $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other |
341 rebasing 8:9790e768172d "I" |
341 rebasing 8:9790e768172d "I" |
342 rebasing 9:5d7b11f5fb97 "Merge" |
342 rebasing 9:5d7b11f5fb97 "Merge" |
343 rebasing 10:9427d4d5af81 "J" (tip) |
343 rebasing 10:9427d4d5af81 "J" (tip) |
344 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-backup.hg (glob) |
344 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-rebase.hg (glob) |
345 |
345 |
346 $ hg tglog |
346 $ hg tglog |
347 @ 8: 'Collapsed revision |
347 @ 8: 'Collapsed revision |
348 | * I |
348 | * I |
349 | * Merge |
349 | * Merge |
393 (no more unresolved files) |
393 (no more unresolved files) |
394 continue: hg rebase --continue |
394 continue: hg rebase --continue |
395 $ hg rebase -c |
395 $ hg rebase -c |
396 rebasing 8:6215fafa5447 "H2" (tip) |
396 rebasing 8:6215fafa5447 "H2" (tip) |
397 note: rebase of 8:6215fafa5447 created no changes to commit |
397 note: rebase of 8:6215fafa5447 created no changes to commit |
398 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-backup.hg (glob) |
398 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-rebase.hg (glob) |
399 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
399 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
400 @ 7:draft 'H' |
400 @ 7:draft 'H' |
401 | |
401 | |
402 | o 6:draft 'G' |
402 | o 6:draft 'G' |
403 |/| |
403 |/| |