Discarding certain files can result in them being marked as deleted and undiscardable

[lucasderraugh]

I've been able to hit this specifically with an xcodeproj modification along with another file below it. Not clear on exactly what causes it yet, but to be investigated.