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 00:02:49 +0100 Message-ID: <87pquok5pi.fsf@telefonica.net> References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288652597 19695 80.91.229.12 (1 Nov 2010 23:03:17 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 1 Nov 2010 23:03:17 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 00:03:13 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 1PD3PE-00011i-QI for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 00:03:13 +0100 Original-Received: from localhost ([127.0.0.1]:42823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD3PE-0002t9-4u for ged-emacs-devel@m.gmane.org; Mon, 01 Nov 2010 19:03:12 -0400 Original-Received: from [140.186.70.92] (port=53778 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD3P7-0002t4-Fl for emacs-devel@gnu.org; Mon, 01 Nov 2010 19:03:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PD3P6-0002xS-DN for emacs-devel@gnu.org; Mon, 01 Nov 2010 19:03:05 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:54192) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PD3P6-0002wz-7w for emacs-devel@gnu.org; Mon, 01 Nov 2010 19:03:04 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PD3P3-0000w7-EF for emacs-devel@gnu.org; Tue, 02 Nov 2010 00:03:01 +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 00:03:01 +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 00:03:01 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 13 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:os3FJEfAJ95nzIBkq6NrTruIVtM= 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:132260 Archived-At: Eli Zaretskii writes: >> > Should we have improved procedures to avoid such incidents in the future? >> >> Definitely. > > Suggestions are welcome. 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.