Mercurial > hg
diff tests/test-rebase-abort.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 | b9bc47211cf5 |
line wrap: on
line diff
--- a/tests/test-rebase-abort.t Fri Dec 07 14:17:09 2018 -0800 +++ b/tests/test-rebase-abort.t Fri Dec 07 14:23:17 2018 -0800 @@ -206,7 +206,7 @@ $ hg rebase -b 4 -d 2 rebasing 3:a6484957d6b9 "B bis" - note: rebase of 3:a6484957d6b9 "B bis" created no changes to commit + note: not rebasing 3:a6484957d6b9 "B bis", its destination already has all its changes rebasing 4:145842775fec "C1" (tip) merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') @@ -493,7 +493,7 @@ $ hg commit -m 'add content draft' -q $ hg rebase -d 'public()' --tool :merge -q - note: rebase of 3:0682fd3dabf5 "disappear draft" created no changes to commit + note: not rebasing 3:0682fd3dabf5 "disappear draft", its destination already has all its changes warning: conflicts while merging root! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue) [1]