Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change 'journal already exists' to 'abandoned transaction found'
authorSune Foldager <cryo@cyanite.org>
Mon, 02 Nov 2009 10:17:20 +0100
changeset 9691 f8e1456e1c2c
parent 9690 b33d70849a20
child 9692 807633f1e3c2
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.
mercurial/localrepo.py file | annotate | diff | comparison | revisions
tests/test-journal-exists.out file | annotate | diff | comparison | revisions 
--- 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:
--- 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
mercurial