changeset 26811 | d1561a422748 |
parent 26781 | 1aee2ab0f902 |
child 26868 | a2aa39a725a1 |
child 26960 | 6979fe2a6d75 |
--- a/hgext/rebase.py Mon Oct 19 15:47:40 2015 -0700 +++ b/hgext/rebase.py Mon Oct 19 16:29:35 2015 +0200 @@ -466,9 +466,9 @@ state[rev] = repo[newnode].rev() ui.debug('rebased as %s\n' % short(newnode)) else: - ui.warn(_('note: rebase of %d:%s created no changes ' - 'to commit\n') % (rev, ctx)) if not collapsef: + ui.warn(_('note: rebase of %d:%s created no changes ' + 'to commit\n') % (rev, ctx)) skipped.add(rev) state[rev] = p1 ui.debug('next revision set to %s\n' % p1)