bzr merge failure

[Martin Pool]

Hi Gavin,

Please report a bug for this at https://launchpad.net/bzr/, including
the traceback that's probably present in ~/.bzr.log.

I suspect you just will not be able to commit those filenames in
current bzr - you have written a good test case for us as well as your
current format.  If the commit succeeded but wrote data it can't merge
that would be a more serious bug.

I would be interested in whether you can reproduce this if you start a
new branch in 2a format.  I think it should work there.

-- 
Martin <http://launchpad.net/~mbp/>