[Top][All Lists]

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

Re: Incorrect merge

From: Jason Rumney
Subject: Re: Incorrect merge
Date: Tue, 02 Nov 2010 09:29:44 +0800
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv: Gecko/20100111 Thunderbird/3.0.1

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.

reply via email to

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