Comment 2 for bug 131323

Jelmer: this is only half-fixed, not Fix Released, AIUI? The NEWS file certainly thinks so. Here's a recent question on IRC:

17:51 < glyph> is bzr-svn supposed to support the svn:mergeinfo to retrieve merge parents?
17:52 < glyph> I have a branch (which, happily, is in a public, open-source project) which has lots of merges from trunk, with appropriate mergeinfo properties on them
17:52 < glyph> 'svn merge --reintegrate branch .' in an SVN working copy works great
17:52 < glyph> 'bzr merge ../branch' in a bzr checkout of trunk gives me tons and tons of conflicts

I've taken the liberty of reopening this bug (as that's the easiest thing to do), but perhaps it would be better to make a new bug for the unsolved half of this bug.