Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 6030:d0dbae32517c
revert: revert clean files when only a change of flags is needed
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 08 Feb 2008 18:07:55 -0200 |
parents | a732eebf1958 |
children | 7383384793fb |
comparison
equal
deleted
inserted
replaced
6029:5b6190dfb344 | 6030:d0dbae32517c |
---|---|
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'): |