Mercurial > hg

diff tests/test-rebase-abort.t @ 23518:2fb0504b8175

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: show warning when rebase creates no changes to commit Similar to graft: note: rebase of 6:eea13746799a created no changes to commit
author Mads Kiilerich <madski@unity3d.com>
date Wed, 10 Dec 2014 06:20:35 +0100
parents 4f18e80d9c30
children aa4a1672583e
line wrap: on
line diff
--- a/tests/test-rebase-abort.t	Tue Dec 09 03:45:26 2014 +0100
+++ b/tests/test-rebase-abort.t	Wed Dec 10 06:20:35 2014 +0100
@@ -162,6 +162,7 @@
   
   $ hg rebase -b 4 -d 2
   rebasing 3:a6484957d6b9 "B bis"
+  note: rebase of 3:a6484957d6b9 created no changes to commit
   rebasing 4:145842775fec "C1" (tip)
   merging c
   warning: conflicts during merge.