# HG changeset patch # User Pierre-Yves David # Date 1406942867 25200 # Node ID aee5385e4bae06a4e19be99f74dba9855b3c7434 # Parent a89bc7833e0dcd9fab26eb4d2c012d827333d611 revert: process removed files missing in target as clean If a file does not exist in target and is marked as removed in the dirstate, we can mark it as clean. There are no changes needed to revert it. diff -r a89bc7833e0d -r aee5385e4bae mercurial/cmdutil.py --- a/mercurial/cmdutil.py Thu Jul 31 15:52:56 2014 -0700 +++ b/mercurial/cmdutil.py Fri Aug 01 18:27:47 2014 -0700 @@ -2429,8 +2429,8 @@ dsmodified -= missingmodified missingadded = dsadded - smf dsadded -= missingadded - missingremoved = dsremoved - smf - dsremoved -= missingremoved + clean |= dsremoved - smf + dsremoved -= clean # action to be actually performed by revert # (, message>) tuple @@ -2449,7 +2449,6 @@ (dsadded, (actions['revert'], True)), (missingadded, (actions['remove'], False)), (dsremoved, (actions['undelete'], True)), - (missingremoved, (None, False)), (clean, (None, False)), )