diff --git a/mercurial/context.py b/mercurial/context.py index 41417443b7d05c5b49aedd60d811aa020709ea56_bWVyY3VyaWFsL2NvbnRleHQucHk=..131d1a09108a702c58bf6c458675a0b24f667a39_bWVyY3VyaWFsL2NvbnRleHQucHk= 100644 --- a/mercurial/context.py +++ b/mercurial/context.py @@ -906,8 +906,6 @@ try: rejected = [] for f in files: - if self._repo.dirstate[f] != 'a': - self._repo.dirstate.remove(f) - elif f not in self._repo.dirstate: + if f not in self._repo.dirstate: self._repo.ui.warn(_("%s not tracked!\n") % join(f)) rejected.append(f) @@ -912,5 +910,7 @@ self._repo.ui.warn(_("%s not tracked!\n") % join(f)) rejected.append(f) + elif self._repo.dirstate[f] != 'a': + self._repo.dirstate.remove(f) else: self._repo.dirstate.drop(f) return rejected