diff -r 09680349cc2d -r 4edd427f34c1 tests/test-rebase-emptycommit.t --- a/tests/test-rebase-emptycommit.t Fri Dec 07 14:17:09 2018 -0800 +++ b/tests/test-rebase-emptycommit.t Fri Dec 07 14:23:17 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 "D" (BOOK-D) created no changes to commit + note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes rebasing 4:69a34c08022a "E" (BOOK-E) - note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit + note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes $ 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 "D" (BOOK-D) created no changes to commit + note: not rebasing 3:e7b3f00ed42e "D" (BOOK-D), its destination already has all its changes rebasing 4:69a34c08022a "E" (BOOK-E) - note: rebase of 4:69a34c08022a "E" (BOOK-E) created no changes to commit + note: not rebasing 4:69a34c08022a "E" (BOOK-E), its destination already has all its changes 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 "C" (BOOK-C) created no changes to commit + note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes rebasing 3:b18e25de2cf5 "D" (BOOK-D) - note: rebase of 3:b18e25de2cf5 "D" (BOOK-D) created no changes to commit + note: not rebasing 3:b18e25de2cf5 "D" (BOOK-D), its destination already has all its changes rebasing 4:86a1f6686812 "E" (BOOK-E E) - note: rebase of 4:86a1f6686812 "E" (BOOK-E E) created no changes to commit + note: not rebasing 4:86a1f6686812 "E" (BOOK-E E), its destination already has all its changes 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 "C" (BOOK-C) created no changes to commit + note: not rebasing 2:dc0947a82db8 "C" (BOOK-C), its destination already has all its changes 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 "F" (BOOK-F) created no changes to commit + note: not rebasing 5:ad6717a6a58e "F" (BOOK-F), its destination already has all its changes rebasing 6:c58e8bdac1f4 "G" (BOOK-G G) saved backup bundle to $TESTTMP/merge2/.hg/strip-backup/b18e25de2cf5-2d487005-rebase.hg