equal
deleted
inserted
replaced
850 ui.warn(_('named branch could not be reset: ' |
850 ui.warn(_('named branch could not be reset: ' |
851 'current branch is still \'%s\'\n') |
851 'current branch is still \'%s\'\n') |
852 % self.dirstate.branch()) |
852 % self.dirstate.branch()) |
853 |
853 |
854 self.dirstate.invalidate() |
854 self.dirstate.invalidate() |
855 self.destroyed() |
|
856 parents = tuple([p.rev() for p in self.parents()]) |
855 parents = tuple([p.rev() for p in self.parents()]) |
857 if len(parents) > 1: |
856 if len(parents) > 1: |
858 ui.status(_('working directory now based on ' |
857 ui.status(_('working directory now based on ' |
859 'revisions %d and %d\n') % parents) |
858 'revisions %d and %d\n') % parents) |
860 else: |
859 else: |
861 ui.status(_('working directory now based on ' |
860 ui.status(_('working directory now based on ' |
862 'revision %d\n') % parents) |
861 'revision %d\n') % parents) |
|
862 self.destroyed() |
863 return 0 |
863 return 0 |
864 |
864 |
865 def invalidatecaches(self): |
865 def invalidatecaches(self): |
866 try: |
866 try: |
867 delattr(self, '_tagscache') |
867 delattr(self, '_tagscache') |