hgext/rebase.py
changeset 40883 4edd427f34c1
parent 40882 09680349cc2d
child 41206 6acbe86c6490
equal deleted inserted replaced
40882:09680349cc2d 40883:4edd427f34c1
   571             if newnode is not None:
   571             if newnode is not None:
   572                 self.state[rev] = repo[newnode].rev()
   572                 self.state[rev] = repo[newnode].rev()
   573                 ui.debug('rebased as %s\n' % short(newnode))
   573                 ui.debug('rebased as %s\n' % short(newnode))
   574             else:
   574             else:
   575                 if not self.collapsef:
   575                 if not self.collapsef:
   576                     ui.warn(_('note: rebase of %s created no changes '
   576                     ui.warn(_('note: not rebasing %s, its destination already '
   577                               'to commit\n') % desc)
   577                               'has all its changes\n') % desc)
   578                     self.skipped.add(rev)
   578                     self.skipped.add(rev)
   579                 self.state[rev] = p1
   579                 self.state[rev] = p1
   580                 ui.debug('next revision set to %d\n' % p1)
   580                 ui.debug('next revision set to %d\n' % p1)
   581         else:
   581         else:
   582             ui.status(_('already rebased %s as %s\n') %
   582             ui.status(_('already rebased %s as %s\n') %