Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-emptycommit.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 | 4441705b7111 |
| children | 4edd427f34c1 |
line wrap: on
line diff
--- a/tests/test-rebase-emptycommit.t Mon Oct 29 21:50:53 2018 +0900 +++ b/tests/test-rebase-emptycommit.t Fri Dec 07 14:17:09 2018 -0800 @@ -51,9 +51,9 @@ $ hg rebase -r 3+4 -d E --keep rebasing 3:e7b3f00ed42e "D" (BOOK-D) - note: rebase of 3:e7b3f00ed42e created no changes to commit + note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit rebasing 4:69a34c08022a "E" (BOOK-E) - note: rebase of 4:69a34c08022a created no changes to commit + note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit $ hg log -G -T '{rev} {desc} {bookmarks}' o 7 E BOOK-D BOOK-E | @@ -84,9 +84,9 @@ $ hg rebase -s 2 -d E rebasing 2:dc0947a82db8 "C" (BOOK-C C) rebasing 3:e7b3f00ed42e "D" (BOOK-D) - note: rebase of 3:e7b3f00ed42e created no changes to commit + note: rebase of 3:e7b3f00ed42e "D" (BOOK-D) created no changes to commit rebasing 4:69a34c08022a "E" (BOOK-E) - note: rebase of 4:69a34c08022a created no changes to commit + note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit rebasing 5:6b2aeab91270 "F" (BOOK-F F) saved backup bundle to $TESTTMP/non-merge/.hg/strip-backup/dc0947a82db8-52bb4973-rebase.hg $ hg log -G -T '{rev} {desc} {bookmarks}' @@ -131,11 +131,11 @@ $ hg rebase -r '(A::)-(B::)-A' -d H rebasing 2:dc0947a82db8 "C" (BOOK-C) - note: rebase of 2:dc0947a82db8 created no changes to commit + note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit rebasing 3:b18e25de2cf5 "D" (BOOK-D) - note: rebase of 3:b18e25de2cf5 created no changes to commit + note: rebase of 3:b18e25de2cf5 "D" (BOOK-D) created no changes to commit rebasing 4:86a1f6686812 "E" (BOOK-E E) - note: rebase of 4:86a1f6686812 created no changes to commit + note: rebase of 4:86a1f6686812 "E" (BOOK-E E) created no changes to commit saved backup bundle to $TESTTMP/merge1/.hg/strip-backup/b18e25de2cf5-1fd0a4ba-rebase.hg $ hg log -G -T '{rev} {desc} {bookmarks}' @@ -180,11 +180,11 @@ $ hg rebase -r '(A::)-(B::)-A' -d H rebasing 2:dc0947a82db8 "C" (BOOK-C) - note: rebase of 2:dc0947a82db8 created no changes to commit + note: rebase of 2:dc0947a82db8 "C" (BOOK-C) created no changes to commit rebasing 3:b18e25de2cf5 "D" (BOOK-D D) rebasing 4:03ca77807e91 "E" (BOOK-E E) rebasing 5:ad6717a6a58e "F" (BOOK-F) - note: rebase of 5:ad6717a6a58e created no changes to commit + note: rebase of 5:ad6717a6a58e "F" (BOOK-F) created no changes to commit rebasing 6:c58e8bdac1f4 "G" (BOOK-G G) saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg