Re: Incorrect merge

[Óscar Fuentes]

Jason Rumney <address@hidden> writes:

> On 02/11/2010 07:02, Óscar Fuentes wrote:
>
>> The problem is that not everything that is committed on emacs-23 branch
>> is intended to be merged into trunk. The solution is obvious: don't
>> merge stuff from emacs-23 into trunk. Just use another branch (let's
>> call it `common-fixes') where patches intended for trunk and emacs-23
>> are applied. Then you merge `common-fixes' into trunk and emacs-23.
>
> How does the developer verify that their change is correct?

By testing it, of course. More precisely, the developer must ensure that
everything he commits to common-fixes works on emacs-23 and trunk.

> The common-fixes branch cannot be expected to build after some time
> has passed, as the changes commited to it might depend on other
> changes that differ between the trunk and emacs-23 branch, but are
> nonetheless required.

This is equivalent to saying that a change on common-fixes could depend
on a change made to emacs-23 only. This does not qualify as a fix
intended for both emacs-23 and trunk, doesn't it?