equal
deleted
inserted
replaced
734 self.join('bookmarks')) |
734 self.join('bookmarks')) |
735 try: |
735 try: |
736 branch = self.opener("undo.branch").read() |
736 branch = self.opener("undo.branch").read() |
737 self.dirstate.setbranch(branch) |
737 self.dirstate.setbranch(branch) |
738 except IOError: |
738 except IOError: |
739 self.ui.warn(_("Named branch could not be reset, " |
739 self.ui.warn(_("named branch could not be reset, " |
740 "current branch still is: %s\n") |
740 "current branch is still: %s\n") |
741 % self.dirstate.branch()) |
741 % self.dirstate.branch()) |
742 self.invalidate() |
742 self.invalidate() |
743 self.dirstate.invalidate() |
743 self.dirstate.invalidate() |
744 self.destroyed() |
744 self.destroyed() |
745 parents = tuple([p.rev() for p in self.parents()]) |
745 parents = tuple([p.rev() for p in self.parents()]) |