equal
deleted
inserted
replaced
270 if patchfile: |
270 if patchfile: |
271 try: |
271 try: |
272 files = set() |
272 files = set() |
273 patch.patch(self.ui, repo, patchfile, files=files, eolmode=None) |
273 patch.patch(self.ui, repo, patchfile, files=files, eolmode=None) |
274 files = list(files) |
274 files = list(files) |
275 except Exception, inst: |
275 except Exception as inst: |
276 seriespath = os.path.join(self.path, 'series') |
276 seriespath = os.path.join(self.path, 'series') |
277 if os.path.exists(seriespath): |
277 if os.path.exists(seriespath): |
278 os.unlink(seriespath) |
278 os.unlink(seriespath) |
279 p1 = repo.dirstate.p1() |
279 p1 = repo.dirstate.p1() |
280 p2 = node |
280 p2 = node |