equal
deleted
inserted
replaced
2427 pmf = repo.changectx(parent).manifest() |
2427 pmf = repo.changectx(parent).manifest() |
2428 if abs in pmf: |
2428 if abs in pmf: |
2429 if mfentry: |
2429 if mfentry: |
2430 # if version of file is same in parent and target |
2430 # if version of file is same in parent and target |
2431 # manifests, do nothing |
2431 # manifests, do nothing |
2432 if pmf[abs] != mfentry: |
2432 if (pmf[abs] != mfentry or |
|
2433 pmf.flags(abs) != mf.flags(abs)): |
2433 handle(revert, False) |
2434 handle(revert, False) |
2434 else: |
2435 else: |
2435 handle(remove, False) |
2436 handle(remove, False) |
2436 |
2437 |
2437 if not opts.get('dry_run'): |
2438 if not opts.get('dry_run'): |