Mercurial > hg
comparison mercurial/cmdutil.py @ 24711:ab6e3729747e
revert: stop marking files clean after interactive revert (issue4592)
The goal of 'hg revert --interactive' is usually to keep some change in the
revert file, so the files -must-not- be marked as clean. We want the status
logic to do its usual job here.
For unclear reasons (probably timing related), I was unable to build an automated
test that reproduced issue4592 but manual testing shows this is fixed.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Sat, 11 Apr 2015 11:54:09 -0400 |
parents | 21e1ece30f8c |
children | a4191e0c728f |
comparison
equal
deleted
inserted
replaced
24710:909ee6b2a024 | 24711:ab6e3729747e |
---|---|
3121 try: | 3121 try: |
3122 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) | 3122 patch.internalpatch(repo.ui, repo, fp, 1, eolmode=None) |
3123 except patch.PatchError, err: | 3123 except patch.PatchError, err: |
3124 raise util.Abort(str(err)) | 3124 raise util.Abort(str(err)) |
3125 del fp | 3125 del fp |
3126 | |
3127 for f in actions['revert'][0]: | |
3128 if normal: | |
3129 normal(f) | |
3130 | |
3131 else: | 3126 else: |
3132 for f in actions['revert'][0]: | 3127 for f in actions['revert'][0]: |
3133 checkout(f) | 3128 checkout(f) |
3134 if normal: | 3129 if normal: |
3135 normal(f) | 3130 normal(f) |