equal
deleted
inserted
replaced
46 |/ |
46 |/ |
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 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob) |
52 saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-backup.hg (glob) |
52 |
53 |
53 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
54 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
54 o 7:secret 'D' |
55 o 7:secret 'D' |
55 | |
56 | |
97 | o 1: 'B' |
98 | o 1: 'B' |
98 |/ |
99 |/ |
99 o 0: 'A' |
100 o 0: 'A' |
100 |
101 |
101 $ hg rebase -s 2 -d 7 |
102 $ hg rebase -s 2 -d 7 |
|
103 rebasing 2:5fddd98957c8 "C" |
|
104 rebasing 3:32af7686d403 "D" |
102 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
105 saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
103 |
106 |
104 $ hg tglog |
107 $ hg tglog |
105 o 7: 'D' |
108 o 7: 'D' |
106 | |
109 | |
149 | o 1: 'B' |
152 | o 1: 'B' |
150 |/ |
153 |/ |
151 o 0: 'A' |
154 o 0: 'A' |
152 |
155 |
153 $ hg rebase -s 1 -d 7 |
156 $ hg rebase -s 1 -d 7 |
|
157 rebasing 1:42ccdea3bb16 "B" |
|
158 rebasing 2:5fddd98957c8 "C" |
|
159 rebasing 3:32af7686d403 "D" |
154 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
160 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
155 |
161 |
156 $ hg tglog |
162 $ hg tglog |
157 o 7: 'D' |
163 o 7: 'D' |
158 | |
164 | |
203 | o 1: 'B' |
209 | o 1: 'B' |
204 |/ |
210 |/ |
205 o 0: 'A' |
211 o 0: 'A' |
206 |
212 |
207 $ hg rebase --collapse -s 2 -d 7 |
213 $ hg rebase --collapse -s 2 -d 7 |
|
214 rebasing 2:5fddd98957c8 "C" |
|
215 rebasing 3:32af7686d403 "D" |
208 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
216 saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) |
209 |
217 |
210 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
218 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
211 o 6:secret 'Collapsed revision |
219 o 6:secret 'Collapsed revision |
212 | * C |
220 | * C |
262 | o 1: 'B' |
270 | o 1: 'B' |
263 |/ |
271 |/ |
264 o 0: 'A' |
272 o 0: 'A' |
265 |
273 |
266 $ hg rebase -s 1 -d tip |
274 $ hg rebase -s 1 -d tip |
|
275 rebasing 1:42ccdea3bb16 "B" |
|
276 rebasing 2:5fddd98957c8 "C" |
|
277 rebasing 3:32af7686d403 "D" |
267 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
278 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-backup.hg (glob) |
268 |
279 |
269 $ hg tglog |
280 $ hg tglog |
270 o 8: 'D' |
281 o 8: 'D' |
271 | |
282 | |
285 |/ |
296 |/ |
286 o 0: 'A' |
297 o 0: 'A' |
287 |
298 |
288 |
299 |
289 $ hg rebase -d 5 -s 7 |
300 $ hg rebase -d 5 -s 7 |
|
301 rebasing 7:13547172c9c0 "C" |
|
302 rebasing 8:4e27a76c371a "D" (tip) |
290 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
303 saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-backup.hg (glob) |
291 $ hg tglog |
304 $ hg tglog |
292 o 8: 'D' |
305 o 8: 'D' |
293 | |
306 | |
294 o 7: 'C' |
307 o 7: 'C' |
323 $ hg ci -m "Merge" |
336 $ hg ci -m "Merge" |
324 $ echo "J" >> F |
337 $ echo "J" >> F |
325 $ hg ci -m "J" |
338 $ hg ci -m "J" |
326 |
339 |
327 $ 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" |
|
342 rebasing 9:5d7b11f5fb97 "Merge" |
|
343 rebasing 10:9427d4d5af81 "J" (tip) |
328 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob) |
344 saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob) |
329 |
345 |
330 $ hg tglog |
346 $ hg tglog |
331 @ 8: 'Collapsed revision |
347 @ 8: 'Collapsed revision |
332 | * I |
348 | * I |
366 $ echo 'H2' > H |
382 $ echo 'H2' > H |
367 $ hg ci -A -m 'H2' |
383 $ hg ci -A -m 'H2' |
368 adding H |
384 adding H |
369 $ hg phase --force --secret 8 |
385 $ hg phase --force --secret 8 |
370 $ hg rebase -s 8 -d 7 --config ui.merge=internal:fail |
386 $ hg rebase -s 8 -d 7 --config ui.merge=internal:fail |
|
387 rebasing 8:6215fafa5447 "H2" (tip) |
371 merging H |
388 merging H |
372 warning: conflicts during merge. |
389 warning: conflicts during merge. |
373 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
390 merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
374 unresolved conflicts (see hg resolve, then hg rebase --continue) |
391 unresolved conflicts (see hg resolve, then hg rebase --continue) |
375 [1] |
392 [1] |
376 $ hg resolve --all -t internal:local |
393 $ hg resolve --all -t internal:local |
377 (no more unresolved files) |
394 (no more unresolved files) |
378 $ hg rebase -c |
395 $ hg rebase -c |
|
396 rebasing 8:6215fafa5447 "H2" (tip) |
379 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
397 saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
380 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
398 $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" |
381 @ 7:draft 'H' |
399 @ 7:draft 'H' |
382 | |
400 | |
383 | o 6:draft 'G' |
401 | o 6:draft 'G' |