Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/localrepo.py @ 13957:044e1356327d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rollback: lower-case warning issued when branch cannot be reset Also improved the word order.
author Martin Geisler <mg@lazybytes.net>
date Tue, 19 Apr 2011 13:25:19 +0200
parents 919174c0aaff
children 141f88ae5276 89e7d35e0ef0
comparison
equal deleted inserted replaced
13955:86b5cc1e8be8 13957:044e1356327d
734 self.join('bookmarks')) 734 self.join('bookmarks'))
735 try: 735 try:
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()
744 self.destroyed() 744 self.destroyed()
745 parents = tuple([p.rev() for p in self.parents()]) 745 parents = tuple([p.rev() for p in self.parents()])