equal
deleted
inserted
replaced
484 dopatch = fp.tell() |
484 dopatch = fp.tell() |
485 fp.seek(0) |
485 fp.seek(0) |
486 |
486 |
487 # 3a. apply filtered patch to clean repo (clean) |
487 # 3a. apply filtered patch to clean repo (clean) |
488 if backups: |
488 if backups: |
489 hg.revert(repo, repo.dirstate.parents()[0], backups.has_key) |
489 hg.revert(repo, repo.dirstate.parents()[0], |
|
490 lambda key: key in backups) |
490 |
491 |
491 # 3b. (apply) |
492 # 3b. (apply) |
492 if dopatch: |
493 if dopatch: |
493 try: |
494 try: |
494 ui.debug('applying patch\n') |
495 ui.debug('applying patch\n') |