only files in normal state should be marked as deleted
fix a traceback when you removed an added file
removing bthis update spans a branch affecting the following files: baborting update spanning branches!(use update -m to merge across branches or -C to lose changes)