Mercurial > public > mercurial-scm > hg-stable
diff mercurial/localrepo.py @ 5814:dd5a501cb97f
restore branch after rollback (issue 902)
| author | Alexandre Vassalotti <mercurial-bugs@selenic.com> |
|---|---|
| date | Mon, 07 Jan 2008 15:26:12 -0600 |
| parents | 41ca0e20117e |
| children | e7127f669edb |
line wrap: on
line diff
--- a/mercurial/localrepo.py Sun Jan 06 15:40:32 2008 +0100 +++ b/mercurial/localrepo.py Mon Jan 07 15:26:12 2008 -0600 @@ -525,9 +525,11 @@ except IOError: ds = "" self.opener("journal.dirstate", "w").write(ds) + self.opener("journal.branch", "w").write(self.dirstate.branch()) renames = [(self.sjoin("journal"), self.sjoin("undo")), - (self.join("journal.dirstate"), self.join("undo.dirstate"))] + (self.join("journal.dirstate"), self.join("undo.dirstate")), + (self.join("journal.branch"), self.join("undo.branch"))] tr = transaction.transaction(self.ui.warn, self.sopener, self.sjoin("journal"), aftertrans(renames)) @@ -557,6 +559,8 @@ self.ui.status(_("rolling back last transaction\n")) transaction.rollback(self.sopener, self.sjoin("undo")) util.rename(self.join("undo.dirstate"), self.join("dirstate")) + branch = self.opener("undo.branch").read() + self.dirstate.setbranch(branch) self.invalidate() self.dirstate.invalidate() else: