Mercurial > hg
comparison tests/test-rebase-interruptions.t @ 40865:4edd427f34c1
rebase: clarify that commits that become empty are skipped
Our message just said that it created no changes, but we didn't
explicitly say that that meant that the the commit was not rebased. It
also wasn't clear why it created no changes, so this patch also
clarifies that that was because the changes were already in the
destination.
Differential Revision: https://phab.mercurial-scm.org/D5395
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Dec 2018 14:23:17 -0800 |
| parents | 09680349cc2d |
| children | 9c9cfecd4600 |
comparison
equal
deleted
inserted
replaced
| 40864:09680349cc2d | 40865:4edd427f34c1 |
|---|---|
| 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 "b" created no changes to commit | 457 note: not rebasing 1:fdaca8533b86 "b", its destination already has all its changes |
| 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 |