Provide a way to merge release branches into trunk

[Vincent Ladeuil]

IWBNI there was a way to propagate bug fixes on releases branches into trunk.

The bzr project now maintains several relases branches (2.0, 2.1, 2.2) in addition to trunk.

We regularly land bug fixes on the release branches. devs then merge the release branches to trunk when they see fit.

It turns out that these merges get delayed (for whatever reasons).

Having a simple way to propagate this bug fixes to later releases and ultimately trunk
would shorten these delays.

[Martin Pool (mbp)]

Does this mean just automatically/regularly merging previous branches to trunk?

[Vincent Ladeuil (vila)]

No, more like the --approve flag Rob added recently (and relying on lp merge proposals to inform
people sounds definitely right too).

Quite often there are conflicts to be resolved and NEWS needs some tweaks, so automating
doesn't sound possible.

I'm affecting this bug to lifeless so he can mark it fix released if/when his patch (for --approve) has landed.

[Robert Collins (lifeless)]

Vincent, I'm not sure what would be needed to consider this fixed? If you can expand on that, I might be able to do something about it. :)