Requesting suggestions for debugging bizarre bzr-svn merge issue

[Max Bowsher]

I've discovered a rather perplexing problem with bzr-svn.

I attempted to branch and then cherrypick some changes from a bzr-svn
imported branch. The cherrypick merge produced some very dodgy results,
looking as if some lines were missing in the merge results, or the
conflict markers were in the wrong place.

On a hunch, I bzr fast-exported and fast-imported the branch, and redid
the exact same merges. The merge results were then much saner.

As a result I conjecture that bzr-svn is doing something broken in the
way it drives bzrlib when importing a branch, which gets ironed out when
roundtripping through a fastimport stream.

Can anyone give me advice on what to look into?

Regrettably the branches in question are ones I am not at liberty to
disclose.

Max.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20100707/6b8fcaf7/attachment.pgp