Re: Incorrect merge

[Jason Rumney]

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?  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.