Re: Release branch plans

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  address@hidden,  address@hidden
> Date: Tue, 03 Apr 2012 12:00:34 +0200
> 
> Glenn Morris <address@hidden> writes:
> 
> > PS If you are not familiar with bzrmerge.el, the whole point is that it
> > does a real merge, then does some tricks to get an effect akin to
> > cherry-picking.
> 
> That's not cherry-picking, it adds additional changes as part of the
> merge.  This is an evil merge.

I agree.  That's what prompted my plea.  I would even consider not
merging at all, neither from trunk to the branch nor the other way
around.  If the number of common revisions is small, cherry-picking is
a lesser evil, and we still get help from the VCS (i.e., no need to do
the same changes twice).

Better ideas are welcome.