Mercurial > hg

diff tests/test-rebase-rename.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-rename.t	Tue Dec 09 03:45:26 2014 +0100
+++ b/tests/test-rebase-rename.t	Wed Dec 10 06:20:35 2014 +0100
@@ -310,10 +310,13 @@
   created new head
   $ hg rebase -s 2 --dest 5 --collapse
   rebasing 2:68bf06433839 "File b created as copy of a and modified"
+  note: rebase of 2:68bf06433839 created no changes to commit
   rebasing 3:af74b229bc02 "File c created as copy of b and modified"
   merging b and c to c
+  note: rebase of 3:af74b229bc02 created no changes to commit
   rebasing 4:dbb9ba033561 "File d created as copy of c and modified"
   merging c and d to d
+  note: rebase of 4:dbb9ba033561 created no changes to commit
   saved backup bundle to $TESTTMP/copy-gets-preserved/.hg/strip-backup/68bf06433839-backup.hg (glob)
   $ hg co tip
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved