bzrlib.errors.MalformedTransform: Tree transform is malformed

[Guy Gascoigne-Piggford]

I've been trying to merge between two branches, where in the parent branch
a series of directory trees have been deleted. This results in a
MalformedTransform error.

I logged a bug with more details
https://bugs.launchpad.net/bzr/+bug/1105358a few days ago.

Now I sort of know how I can work around it by explicitly generating the
diff, editing out the missing revisions and then just doing checkins in the
other branch but that will leave the branch as not knowing that a merge has
occurred, but I'm concerned that from this point onwards the error will
continue to occur and we'll be stuck doing manual merges between these
branches in the future.

Can anyone suggest a better way around the problem.

Thanks - Guy
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20130201/0ccca309/attachment.html>