##// END OF EJS Templates
transplant: clobber old series when transplant fails
Brendan Cully -
r3757:faed44ba default
parent child Browse files
Show More
@@ -209,6 +209,9 b' class transplanter:'
209 except Exception, inst:
209 except Exception, inst:
210 if filter:
210 if filter:
211 os.unlink(patchfile)
211 os.unlink(patchfile)
212 seriespath = os.path.join(self.path, 'series')
213 if os.path.exists(seriespath):
214 os.unlink(seriespath)
212 p1 = repo.dirstate.parents()[0]
215 p1 = repo.dirstate.parents()[0]
213 p2 = node
216 p2 = node
214 self.log(user, date, message, p1, p2, merge=merge)
217 self.log(user, date, message, p1, p2, merge=merge)
General Comments 0
You need to be logged in to leave comments. Login now