Re: Incorrect merge

[Óscar Fuentes]

Andreas Schwab <address@hidden> writes:

> Óscar Fuentes <address@hidden> writes:
>
>> This is equivalent to saying that a change on common-fixes could depend
>> on a change made to emacs-23 only.
>
> How do you keep the branch up-to-date?

AFAIK almost all changes to emacs-23 are eventually merged into
trunk. This means that common-fixes would containt all changes intended
to emacs-23, except those few which are not intended for trunk. This
means that the divergence of emacs-23 from common-fixes will not be
significant.