Comment 2 for bug 842575

I found a way to deal with this problem: "bzr revert" on the named file will restore the output of "bzr status". I still believe that this shouldn't be needed.

I also found another detail: recreating the file after the resolve will cause it to be listed as added instead of missing. I've included my expectation for this case in the attached branch as well.