equal
deleted
inserted
replaced
714 if dryrun: |
714 if dryrun: |
715 return |
715 return |
716 transaction.rollback(self.sopener, self.sjoin("undo"), |
716 transaction.rollback(self.sopener, self.sjoin("undo"), |
717 self.ui.warn) |
717 self.ui.warn) |
718 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
718 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
|
719 if os.path.exists(self.join('undo.bookmarks')): |
|
720 util.rename(self.join('undo.bookmarks'), |
|
721 self.join('bookmarks')) |
719 try: |
722 try: |
720 branch = self.opener("undo.branch").read() |
723 branch = self.opener("undo.branch").read() |
721 self.dirstate.setbranch(branch) |
724 self.dirstate.setbranch(branch) |
722 except IOError: |
725 except IOError: |
723 self.ui.warn(_("Named branch could not be reset, " |
726 self.ui.warn(_("Named branch could not be reset, " |