Mercurial > hg > pyhgsh

diff mercurial/hg.py @ 557:b9fee419a1bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-----
author mpm@selenic.com
date Fri, 01 Jul 2005 08:54:52 -0800
parents f6c6fa15ff70
children cdddf4652aec
line wrap: on
line diff
--- 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")