[PATCH] trivial patch fixes recover

K Thananchayan thananck at yahoo.com
Fri Jul 1 05:11:18 CDT 2005


The following patch fixes recover. Transaction file is
always named 'journal' and accessed as such during
recovery.

Thanks,

-thanan

__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com 
-------------- next part --------------
# HG changeset patch
# User thananck at yahoo.com
# Node ID 877942ea8480485d25e60830f1e922e941ad2605
# Parent  f6c6fa15ff706c79d77b47baacfb7e4fafd1a22e

During 'recover', the transaction file name 'journal' is used as it has not been changed anyway in mercurial.

diff -r f6c6fa15ff70 -r 877942ea8480 mercurial/hg.py
--- a/mercurial/hg.py	Fri Jul 01 08:34:50 2005
+++ b/mercurial/hg.py	Fri Jul 01 10:10:56 2005
@@ -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")
 


More information about the Mercurial mailing list