From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Tue, 02 Nov 2010 06:16:03 +0100 Message-ID: <87lj5cjofg.fsf@telefonica.net> References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87pquok5pi.fsf@telefonica.net> <4CCF6988.4040804@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1288675010 4963 80.91.229.12 (2 Nov 2010 05:16:50 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 05:16:50 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 06:16:46 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PD9EX-0007WT-IN for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 06:16:33 +0100 Original-Received: from localhost ([127.0.0.1]:53622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD9EW-0005R5-Td for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 01:16:32 -0400 Original-Received: from [140.186.70.92] (port=46119 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD9EN-0005R0-Nq for emacs-devel@gnu.org; Tue, 02 Nov 2010 01:16:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PD9EM-0000tm-NM for emacs-devel@gnu.org; Tue, 02 Nov 2010 01:16:23 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:58096) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PD9EM-0000te-GX for emacs-devel@gnu.org; Tue, 02 Nov 2010 01:16:22 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PD9EK-0007IO-P6 for emacs-devel@gnu.org; Tue, 02 Nov 2010 06:16:20 +0100 Original-Received: from 83.42.13.98 ([83.42.13.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 06:16:20 +0100 Original-Received: from ofv by 83.42.13.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 06:16:20 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 23 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:0p7gba8/jt3Cx9TdvPh1fX5XU3E= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132268 Archived-At: Jason Rumney 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?