--- a/mercurial/cmdutil.py Fri Mar 03 14:10:06 2017 -0500
+++ b/mercurial/cmdutil.py Wed Feb 24 14:44:14 2016 -0800
@@ -2976,13 +2976,6 @@
clean = set(changes.clean)
modadded = set()
- # determine the exact nature of the deleted changesets
- deladded = set(_deleted)
- for path in _deleted:
- if path in mf:
- deladded.remove(path)
- deleted = _deleted - deladded
-
# We need to account for the state of the file in the dirstate,
# even when we revert against something else than parent. This will
# slightly alter the behavior of revert (doing back up or not, delete
@@ -3040,6 +3033,13 @@
dsremoved.add(src)
names[src] = (repo.pathto(src, cwd), True)
+ # determine the exact nature of the deleted changesets
+ deladded = set(_deleted)
+ for path in _deleted:
+ if path in mf:
+ deladded.remove(path)
+ deleted = _deleted - deladded
+
# distinguish between file to forget and the other
added = set()
for abs in dsadded: