Mercurial > hg-stable
diff tests/test-rebase-obsolete.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 | 8a544fb645bb |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Tue Dec 09 03:45:26 2014 +0100 +++ b/tests/test-rebase-obsolete.t Wed Dec 10 06:20:35 2014 +0100 @@ -125,8 +125,10 @@ grafting 3:32af7686d403 "D" $ hg rebase -s 42ccdea3bb16 -d . rebasing 1:42ccdea3bb16 "B" + note: rebase of 1:42ccdea3bb16 created no changes to commit rebasing 2:5fddd98957c8 "C" rebasing 3:32af7686d403 "D" + note: rebase of 3:32af7686d403 created no changes to commit $ hg log -G o 10:5ae4c968c6ac C | @@ -204,6 +206,7 @@ $ hg rebase --source 'desc(B)' --dest 'tip' rebasing 8:8877864f1edb "B" rebasing 9:08483444fef9 "D" + note: rebase of 9:08483444fef9 created no changes to commit rebasing 10:5ae4c968c6ac "C" $ hg debugobsolete 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (*) {'user': 'test'} (glob) @@ -258,8 +261,11 @@ $ cd collapse $ hg rebase -s 42ccdea3bb16 -d eea13746799a --collapse rebasing 1:42ccdea3bb16 "B" + note: rebase of 1:42ccdea3bb16 created no changes to commit 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 $ hg log -G o 8:4dc2197e807b Collapsed revision |