<oerjan> learn `revert is a bit buggy. The canary.orig error message is annoying but seemingly harmless. However, reverting a newly created file tends not to work - use `rm instead.