Mercurial > hg
changeset 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 | 909ee6b2a024 |
| children | bbf1ae6b6a44 |
| files | mercurial/cmdutil.py |
| diffstat | 1 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Apr 11 11:56:21 2015 -0400 +++ b/mercurial/cmdutil.py Sat Apr 11 11:54:09 2015 -0400 @@ -3123,11 +3123,6 @@ except patch.PatchError, err: raise util.Abort(str(err)) del fp - - for f in actions['revert'][0]: - if normal: - normal(f) - else: for f in actions['revert'][0]: checkout(f)