I just had the same problem.. I'm building a Java variant of Bundle Buggy and was using a test repository and silly fixes on it to test an automatic merge/build/create-binary-fix process. During this test I caused the SAME merge directive (as created by bzr send) to be merged twice. The merges were applied with --force on a clean tree. The resulting tree causes the problem.
I just had the same problem.. I'm building a Java variant of Bundle Buggy and was using a test repository and silly fixes on it to test an automatic merge/build/ create- binary- fix process. During this test I caused the SAME merge directive (as created by bzr send) to be merged twice. The merges were applied with --force on a clean tree. The resulting tree causes the problem.
To reproduce:
use a base branch, say ~/base
bzr branch ~/base ~/hack
cd ~/hack
(edit, edit, commit, commit)
bzr send -o ~/my-hacks.patch
Now merge 2ce:
bzr branch ~/base ~/test
cd ~/test
bzr merge ~/my-hacks.patch
bzr merge --force ~/my-hacks.patch
Both merges complete succesfully, but after this the above error occurs and both status and commit fail.