Mercurial > hg

diff mercurial/localrepo.py @ 9691:f8e1456e1c2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change 'journal already exists' to 'abandoned transaction found' Journal already exists is a pretty internal piece of information, which doesn't necessarily mean much to people who are not familiar with the code. The new text is a more well-known concept.
author Sune Foldager <cryo@cyanite.org>
date Mon, 02 Nov 2009 10:17:20 +0100
parents ee913987e4b0
children 0b999aec64e8
line wrap: on
line diff
--- a/mercurial/localrepo.py	Mon Nov 02 10:15:04 2009 +0100
+++ b/mercurial/localrepo.py	Mon Nov 02 10:17:20 2009 +0100
@@ -556,7 +556,7 @@
 
         # abort here if the journal already exists
         if os.path.exists(self.sjoin("journal")):
-            raise error.RepoError(_("journal already exists - run hg recover"))
+            raise error.RepoError(_("abandoned transaction found - run hg recover"))
 
         # save dirstate for rollback
         try: