How do I revert an unversioned file?

[Glenn Morris]

The short answer is that `bzr resolve FILE --take-this' worked, thanks.

The slightly longer answer is that nothing else did:

bzr revert FILE.OTHER
  - got rid of FILE.OTHER, left FILE.BASE in state "unknown", and
  still with a contents conflict in FILE.

bzr revert FILE.BASE did nothing ("not versioned"). Just thought I'd
try it.

rm FILE.BASE still left me with "Contents conflict in FILE" which I
could not get rid of.


That was confusing...