hgext/rebase.py
changeset 23519 8872d1bf30da
parent 23518 2fb0504b8175
child 23520 de143427c499
--- a/hgext/rebase.py	Wed Dec 10 06:20:35 2014 +0100
+++ b/hgext/rebase.py	Wed Dec 10 06:20:35 2014 +0100
@@ -411,15 +411,16 @@
                 # Update the state
                 if newnode is not None:
                     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.debug('next revision set to %s\n' % p1)
                         skipped.add(rev)
                     state[rev] = p1
+                    ui.debug('next revision set to %s\n' % p1)
             elif state[rev] == nullmerge:
-                pass
+                ui.debug('ignoring null merge rebase of %s\n' % rev)
             elif state[rev] == revignored:
                 ui.status(_('not rebasing ignored %s\n') % desc)
             else: