author | mpm@selenic.com |
Tue, 10 May 2005 00:32:05 -0800 | |
changeset 43 | 42177b56b949 |
parent 42 | 91f1fa847158 |
child 44 | e825a68d7227 |
--- a/mercurial/transaction.py +++ b/mercurial/transaction.py @@ -22,7 +22,9 @@ class transaction: # abort here if the journal already exists if os.path.exists(self.journal): - raise "Journal already exists!" + print "journal already exists, recovering" + self.recover() + self.file = open(self.journal, "w") def __del__(self): @@ -59,4 +61,5 @@ class transaction: for l in open(self.journal).readlines(): f, o = l.split('\0') self.opener(f, "a").truncate(int(o)) + os.unlink(self.journal)