Mercurial > hg
diff tests/test-rebase-newancestor.t @ 23518:2fb0504b8175
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 | 4ab66de46a96 |
line wrap: on
line diff
--- a/tests/test-rebase-newancestor.t Tue Dec 09 03:45:26 2014 +0100 +++ b/tests/test-rebase-newancestor.t Wed Dec 10 06:20:35 2014 +0100 @@ -128,6 +128,7 @@ $ hg rebase -r 'only(dev,default)' -d default rebasing 1:1d1a643d390e "dev: create branch" + note: rebase of 1:1d1a643d390e created no changes to commit rebasing 2:ec2c14fb2984 "dev: f-dev stuff" rebasing 4:4b019212aaf6 "dev: merge default" remote changed f-default which local deleted