Mercurial > hg
diff tests/test-rebase-detach.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 | aa4a1672583e |
line wrap: on
line diff
--- a/tests/test-rebase-detach.t Tue Dec 09 03:45:26 2014 +0100 +++ b/tests/test-rebase-detach.t Wed Dec 10 06:20:35 2014 +0100 @@ -212,7 +212,9 @@ $ hg rebase --collapse -s 2 -d 7 rebasing 2:5fddd98957c8 "C" + note: rebase of 2:5fddd98957c8 created no changes to commit rebasing 3:32af7686d403 "D" + note: rebase of 3:32af7686d403 created no changes to commit saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-backup.hg (glob) $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" @@ -339,8 +341,11 @@ $ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other rebasing 8:9790e768172d "I" + note: rebase of 8:9790e768172d created no changes to commit rebasing 9:5d7b11f5fb97 "Merge" + note: rebase of 9:5d7b11f5fb97 created no changes to commit rebasing 10:9427d4d5af81 "J" (tip) + note: rebase of 10:9427d4d5af81 created no changes to commit saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-backup.hg (glob) $ hg tglog @@ -394,6 +399,7 @@ (no more unresolved files) $ hg rebase -c rebasing 8:6215fafa5447 "H2" (tip) + note: rebase of 8:6215fafa5447 created no changes to commit saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" @ 7:draft 'H'