Re: Release branch plans

[Glenn Morris]

Andreas Schwab wrote:

> Glenn Morris <address@hidden> writes:
>
>> The new proposal is presumably to commit everything on the trunk, and
>> label those things that need to also go to the release branch in some
>> way (eg "merge to emacs-24 branch"). Then use bzrmerge.el to merge from
>> trunk to branch, skipping everything not so labelled. This would work.
>
> That wouldn't be merges any more, but a series of cherry-picks.

Not as I envisage it; or (tried to) describe it.

If we could do what you seem to be saying, then we could just do that
when merging from release branch to trunk, and the issue that started
this discussion would not arise in the first place.

But we can't, because bzr does not track cherry-picked revisions.
(IIUC, etc, etc).