Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/transplant.py @ 3757:faed44bab17b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: clobber old series when transplant fails
author Brendan Cully <brendan@kublai.com>
date Fri, 01 Dec 2006 14:30:17 -0800
parents f902f409cd81
children 889f7e74a0d9
comparison
equal deleted inserted replaced
3756:2f2b59fcb394 3757:faed44bab17b
207 if filter: 207 if filter:
208 os.unlink(patchfile) 208 os.unlink(patchfile)
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)
215 self.ui.write(str(inst) + '\n') 218 self.ui.write(str(inst) + '\n')
216 raise util.Abort(_('Fix up the merge and run hg transplant --continue')) 219 raise util.Abort(_('Fix up the merge and run hg transplant --continue'))