equal
deleted
inserted
replaced
309 o 0: 4a2df7238c3b public 'A' |
309 o 0: 4a2df7238c3b public 'A' |
310 |
310 |
311 $ hg rebase --continue |
311 $ hg rebase --continue |
312 already rebased 2:965c486023db "C" as 401ccec5e39f |
312 already rebased 2:965c486023db "C" as 401ccec5e39f |
313 rebasing 6:a0b2430ebfb8 "F" |
313 rebasing 6:a0b2430ebfb8 "F" |
314 saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) |
314 saved backup bundle to $TESTTMP/hook-precommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg |
315 $ hg tglogp |
315 $ hg tglogp |
316 @ 6: 6e92a149ac6b secret 'F' |
316 @ 6: 6e92a149ac6b secret 'F' |
317 | |
317 | |
318 o 5: 401ccec5e39f secret 'C' |
318 o 5: 401ccec5e39f secret 'C' |
319 | |
319 | |
364 o 0: 4a2df7238c3b public 'A' |
364 o 0: 4a2df7238c3b public 'A' |
365 |
365 |
366 $ hg rebase --continue |
366 $ hg rebase --continue |
367 already rebased 2:965c486023db "C" as 401ccec5e39f |
367 already rebased 2:965c486023db "C" as 401ccec5e39f |
368 rebasing 6:a0b2430ebfb8 "F" |
368 rebasing 6:a0b2430ebfb8 "F" |
369 saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) |
369 saved backup bundle to $TESTTMP/hook-pretxncommit/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg |
370 $ hg tglogp |
370 $ hg tglogp |
371 @ 6: 6e92a149ac6b secret 'F' |
371 @ 6: 6e92a149ac6b secret 'F' |
372 | |
372 | |
373 o 5: 401ccec5e39f secret 'C' |
373 o 5: 401ccec5e39f secret 'C' |
374 | |
374 | |
414 o 0: 4a2df7238c3b public 'A' |
414 o 0: 4a2df7238c3b public 'A' |
415 |
415 |
416 $ hg rebase --continue |
416 $ hg rebase --continue |
417 already rebased 2:965c486023db "C" as 401ccec5e39f |
417 already rebased 2:965c486023db "C" as 401ccec5e39f |
418 rebasing 6:a0b2430ebfb8 "F" |
418 rebasing 6:a0b2430ebfb8 "F" |
419 saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg (glob) |
419 saved backup bundle to $TESTTMP/hook-pretxnclose/.hg/strip-backup/965c486023db-aa6250e7-rebase.hg |
420 $ hg tglogp |
420 $ hg tglogp |
421 @ 6: 6e92a149ac6b secret 'F' |
421 @ 6: 6e92a149ac6b secret 'F' |
422 | |
422 | |
423 o 5: 401ccec5e39f secret 'C' |
423 o 5: 401ccec5e39f secret 'C' |
424 | |
424 | |
457 (no more unresolved files) |
457 (no more unresolved files) |
458 continue: hg rebase --continue |
458 continue: hg rebase --continue |
459 $ hg rebase --continue |
459 $ hg rebase --continue |
460 rebasing 1:fdaca8533b86 "b" |
460 rebasing 1:fdaca8533b86 "b" |
461 note: rebase of 1:fdaca8533b86 created no changes to commit |
461 note: rebase of 1:fdaca8533b86 created no changes to commit |
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg (glob) |
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
463 $ hg resolve --list |
463 $ hg resolve --list |
464 $ test -f .hg/merge |
464 $ test -f .hg/merge |
465 [1] |
465 [1] |