Re: Incorrect merge

[Óscar Fuentes]

Stefan Monnier <address@hidden> writes:

> It's difficult enough to make sure patches get installed in the right
> (emacs-23 or trunk) branch and to keep them in sync, that adding another
> branch would just add to the work.
> Using an ad-hoc script on the other hand would *reduce* the work.

Unless you end writing the Mythical Magic Script, the effects will be
the reverse: more complexity, more confusion, more mistakes.

>> BTW, do you realize that the script would end cherry-picking commits and
>> that bzr has no support for tracking cherry-picks? This way it is not
>> possible to easily track commits across branches.
>
> Of course that would end up doing cherry-picking, so what?
> We already do that by hand, so doing in from a script can't be worse.

The proposed branch would eliminate the need for cherry-picking, hence
improving the traceability of patches.