# HG changeset patch # User Patrick Mezard # Date 2012-02-16 11:56:48 # Node ID 131d1a09108a702c58bf6c458675a0b24f667a39 # Parent 41417443b7d05c5b49aedd60d811aa020709ea56 context: make workingctx.forget() really warn about untracked files diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -906,11 +906,11 @@ class workingctx(changectx): 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) + elif self._repo.dirstate[f] != 'a': + self._repo.dirstate.remove(f) else: self._repo.dirstate.drop(f) return rejected