Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 40864:09680349cc2d
rebase: format commit in usual way when explaining that it became empty
We use the _ctxdesc() for other similar messages, so it seems we
should use it here too.
Differential Revision: https://phab.mercurial-scm.org/D5394
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Dec 2018 14:17:09 -0800 |
| parents | 2009d84f245a |
| children | 4edd427f34c1 |
comparison
equal
deleted
inserted
replaced
| 40863:443eb4bc41af | 40864:09680349cc2d |
|---|---|
| 452 $ hg resolve --mark a | 452 $ hg resolve --mark a |
| 453 (no more unresolved files) | 453 (no more unresolved files) |
| 454 continue: hg rebase --continue | 454 continue: hg rebase --continue |
| 455 $ hg rebase --continue | 455 $ hg rebase --continue |
| 456 rebasing 1:fdaca8533b86 "b" | 456 rebasing 1:fdaca8533b86 "b" |
| 457 note: rebase of 1:fdaca8533b86 created no changes to commit | 457 note: rebase of 1:fdaca8533b86 "b" created no changes to commit |
| 458 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg | 458 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg |
| 459 $ hg resolve --list | 459 $ hg resolve --list |
| 460 $ test -d .hg/merge | 460 $ test -d .hg/merge |
| 461 [1] | 461 [1] |
| 462 Now try again with --collapse | 462 Now try again with --collapse |