Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 13356:d96db730fcb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: merge rollback support into localrepo
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Feb 2011 13:46:27 -0600
parents cce2e7b77e36
children b67867940bd1
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu Feb 10 13:46:27 2011 -0600
+++ b/mercurial/localrepo.py	Thu Feb 10 13:46:27 2011 -0600
@@ -716,6 +716,9 @@
                 transaction.rollback(self.sopener, self.sjoin("undo"),
                                      self.ui.warn)
                 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
+                if os.path.exists(self.join('undo.bookmarks')):
+                    util.rename(self.join('undo.bookmarks'),
+                                self.join('bookmarks'))
                 try:
                     branch = self.opener("undo.branch").read()
                     self.dirstate.setbranch(branch)