hgext/transplant.py
changeset 25660 328739ea70c3
parent 25186 80c5b2666a96
child 25695 ce3d4b858420
equal deleted inserted replaced
25659:d60678a567a9 25660:328739ea70c3
   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