Support svn:mergeinfo

[Jelmer Vernooij]

  affects /products/bzr-svn
  importance medium
  status triaged

The svn:mergeinfo should be supported where possible to find merge
parents. Obviously, this can only work for full merges at this point,
not for cherry picks.

[Jelmer Vernooij (jelmer)]

The mergeinfo property can now be written

[Andrew Bennetts (spiv)]

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.

[Jelmer Vernooij (jelmer)]

This requires support in Bazaar for cherrypicks.

[Jelmer Vernooij (jelmer)]

Or rather, it doesn't strictly require support in Bazaar for cherrypicks but without such support it will be expensive to calculate the full merges in bzr-svn and it will be a significant amount of engineering work that will become obsolete when bazaar starts supporting cherrypicks. It would also require a mapping version bump.

[Jelmer Vernooij (jelmer)]

I've marked 67174 as affecting bzr-svn