# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1257153440 -3600
# Node ID f8e1456e1c2cb32508aca2c151f6950fc3af4760
# Parent  b33d70849a20930e6844ef6ce0d9d3bd823dcbe3
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.

diff -r b33d70849a20 -r f8e1456e1c2c mercurial/localrepo.py
--- 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:
diff -r b33d70849a20 -r f8e1456e1c2c tests/test-journal-exists.out
--- a/tests/test-journal-exists.out	Mon Nov 02 10:15:04 2009 +0100
+++ b/tests/test-journal-exists.out	Mon Nov 02 10:17:20 2009 +0100
@@ -1,5 +1,5 @@
 adding a
-abort: journal already exists - run hg recover!
+abort: abandoned transaction found - run hg recover!
 rolling back interrupted transaction
 checking changesets
 checking manifests