##// END OF EJS Templates
rollback: lower-case warning issued when branch cannot be reset...
Martin Geisler -
r13957:044e1356 stable
parent child Browse files
Show More
@@ -736,8 +736,8 b' class localrepository(repo.repository):'
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()
@@ -57,7 +57,7 b' Test rollback of hg before issue 902 was'
57 $ rm .hg/undo.branch
57 $ rm .hg/undo.branch
58 $ hg rollback
58 $ hg rollback
59 repository tip rolled back to revision -1 (undo commit)
59 repository tip rolled back to revision -1 (undo commit)
60 Named branch could not be reset, current branch still is: test
60 named branch could not be reset, current branch is still: test
61 working directory now based on revision -1
61 working directory now based on revision -1
62 $ hg branch
62 $ hg branch
63 test
63 test
General Comments 0
You need to be logged in to leave comments. Login now