Mercurial > hg
diff tests/test-rebase-newancestor.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 | 4764e8436b2a |
line wrap: on
line diff
--- a/tests/test-rebase-newancestor.t Fri Dec 07 14:17:09 2018 -0800 +++ b/tests/test-rebase-newancestor.t Fri Dec 07 14:23:17 2018 -0800 @@ -130,7 +130,7 @@ > c > EOF rebasing 1:1d1a643d390e "dev: create branch" - note: rebase of 1:1d1a643d390e "dev: create branch" created no changes to commit + note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 4:4b019212aaf6 "dev: merge default" file 'f-default' was deleted in local [dest] but was modified in other [source].