It is fixed now. I've set the append-only flag to prevent this from recurring.
The commands I used, in case somebody does this again somewhere: 1. Get the revision just before the mangling merge, using its ID. You can use 'bzr visualise' or 'bzr log --show-ids' to find it. e.g.: bzr branch lp:lib2geom -r goejendaagh@...2728... 2. Merge the correct way bzr merge lp:lib2geom 3. Commit. You can give credit to the author of the changes that obfuscated the revision history using the --author option bzr commit --author "Master Brokeder <brokeder@...2729...> 4. Replace trunk with cleaned-up branch ~src/lib2geom$ bzr push --overwrite lp:lib2geom 5. You can now convert the branch you worked with into a trunk checkout bzr bind :push
Regards, Krzysztof