Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 36777:66c569e57c70
tests: add test for issue 5494 but with --collapse
This was not fixed, so the test case currently demonstrates the
breakage.
Differential Revision: https://phab.mercurial-scm.org/D2714
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 07 Mar 2018 11:00:17 -0800 |
parents | c164a3a282c1 |
children | 9457c395fcbb |
comparison
equal
deleted
inserted
replaced
36776:c164a3a282c1 | 36777:66c569e57c70 |
---|---|
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 | 462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
463 $ hg resolve --list | 463 $ hg resolve --list |
464 $ test -d .hg/merge | 464 $ test -d .hg/merge |
465 [1] | 465 [1] |
466 Now try again with --collapse | |
467 $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg | |
468 $ hg rebase -s 2 -d 1 --noninteractive --collapse | |
469 rebasing 2:fdaca8533b86 "b" (tip) | |
470 merging a | |
471 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | |
472 unresolved conflicts (see hg resolve, then hg rebase --continue) | |
473 [1] | |
474 $ echo a > a | |
475 $ echo c >> a | |
476 $ hg resolve --mark a | |
477 (no more unresolved files) | |
478 continue: hg rebase --continue | |
479 $ hg rebase --continue | |
480 rebasing 2:fdaca8533b86 "b" (tip) | |
481 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg | |
482 BROKEN: the merge state was not cleared | |
483 $ hg resolve --list | |
484 R a | |
485 $ test -d .hg/merge |