# HG changeset patch
# User mpm@selenic.com
# Date 1120236892 28800
# Node ID b9fee419a1bdbb8edae6982d49172344067897ec
# Parent  f6c6fa15ff706c79d77b47baacfb7e4fafd1a22e
recover: the journal is named 'journal'

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

recover: the journal is named 'journal'

spotted by K Thananchayan <thananck@yahoo.com>

manifest hash: a2ecfedb3d58011cdf5ef7741ff61aba15aa5885
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCxXVbywK+sNU5EO8RAmiBAKCgULQVAZ42xuPRyzb3Rrk794LtaACgoLdF
TNtgK/MqF6+EjWNJ5mm2geE=
=m5U3
-----END PGP SIGNATURE-----


diff -r f6c6fa15ff70 -r b9fee419a1bd mercurial/hg.py
--- a/mercurial/hg.py	Fri Jul 01 00:34:50 2005 -0800
+++ b/mercurial/hg.py	Fri Jul 01 08:54:52 2005 -0800
@@ -525,9 +525,9 @@
 
     def recover(self):
         lock = self.lock()
-        if os.path.exists(self.join("recover")):
+        if os.path.exists(self.join("journal")):
             self.ui.status("rolling back interrupted transaction\n")
-            return transaction.rollback(self.opener, self.join("recover"))
+            return transaction.rollback(self.opener, self.join("journal"))
         else:
             self.ui.warn("no interrupted transaction available\n")