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