equal
deleted
inserted
replaced
451 return ret |
451 return ret |
452 except: |
452 except: |
453 try: |
453 try: |
454 tr.abort() |
454 tr.abort() |
455 finally: |
455 finally: |
456 repo.reload() |
456 repo.invalidate() |
457 repo.wreload() |
457 repo.dirstate.invalidate() |
458 raise |
458 raise |
459 |
459 |
460 def _apply(self, tr, repo, series, list=False, update_status=True, |
460 def _apply(self, tr, repo, series, list=False, update_status=True, |
461 strict=False, patchdir=None, merge=None, wlock=None, |
461 strict=False, patchdir=None, merge=None, wlock=None, |
462 lock=None, all_files={}): |
462 lock=None, all_files={}): |