[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Incorrect merge

From: Óscar Fuentes
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 15:17:08 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]