Mercurial > hg-stable

diff tests/test-rebase-scenario-global.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-scenario-global.t	Tue Dec 09 03:45:26 2014 +0100
+++ b/tests/test-rebase-scenario-global.t	Wed Dec 10 06:20:35 2014 +0100
@@ -121,6 +121,7 @@
   $ hg rebase -s 4 -d 7
   rebasing 4:9520eea781bc "E"
   rebasing 6:eea13746799a "G"
+  note: rebase of 6:eea13746799a created no changes to commit
   saved backup bundle to $TESTTMP/a3/.hg/strip-backup/9520eea781bc-backup.hg (glob)
 
   $ hg tglog
@@ -149,6 +150,7 @@
   $ hg rebase -s 5 -d 4
   rebasing 5:24b6387c8c8c "F"
   rebasing 6:eea13746799a "G"
+  note: rebase of 6:eea13746799a created no changes to commit
   rebasing 7:02de42196ebe "H" (tip)
   saved backup bundle to $TESTTMP/a4/.hg/strip-backup/24b6387c8c8c-backup.hg (glob)