Mercurial > hg

diff hgext/rebase.py @ 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 8872d1bf30da
line wrap: on
line diff
--- a/hgext/rebase.py	Tue Dec 09 03:45:26 2014 +0100
+++ b/hgext/rebase.py	Wed Dec 10 06:20:35 2014 +0100
@@ -412,8 +412,9 @@
                 if newnode is not None:
                     state[rev] = repo[newnode].rev()
                 else:
+                    ui.warn(_('note: rebase of %d:%s created no changes '
+                              'to commit\n') % (rev, ctx))
                     if not collapsef:
-                        ui.note(_('no changes, revision %d skipped\n') % rev)
                         ui.debug('next revision set to %s\n' % p1)
                         skipped.add(rev)
                     state[rev] = p1