Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 25259:5b05f10c5024
revert: fix edition of newly added file during --interactive
Before this patch: editing hunks of newly added file when performing a revert
--interactive had no effect: the edits were discarded.
After this patch, the edits are taken into account.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Thu, 21 May 2015 14:34:24 -0700 |
| parents | f37a69ec3f47 |
| children | 1b1eaf1885df |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Thu May 21 14:25:57 2015 -0700 +++ b/mercurial/cmdutil.py Thu May 21 14:34:24 2015 -0700 @@ -3123,6 +3123,7 @@ else: normal = repo.dirstate.normal + newlyaddedandmodifiedfiles = set() if interactive: # Prompt the user for changes to revert torevert = [repo.wjoin(f) for f in actions['revert'][0]] @@ -3137,6 +3138,7 @@ except patch.PatchError, err: raise util.Abort(_('error parsing patch: %s') % err) + newlyaddedandmodifiedfiles = newandmodified(chunks, originalchunks) # Apply changes fp = cStringIO.StringIO() for c in chunks: @@ -3160,8 +3162,10 @@ repo.dirstate.normallookup(f) for f in actions['add'][0]: - checkout(f) - repo.dirstate.add(f) + # Don't checkout modified files, they are already created by the diff + if f not in newlyaddedandmodifiedfiles: + checkout(f) + repo.dirstate.add(f) normal = repo.dirstate.normallookup if node == parent and p2 == nullid: