From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Tue, 02 Nov 2010 17:21:18 -0400 Message-ID: References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> <87d3qnk9am.fsf@telefonica.net> <837hgv605e.fsf@gnu.org> <8762wfilec.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288732897 22249 80.91.229.12 (2 Nov 2010 21:21:37 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 21:21:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?iso-8859-1?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 22:21:32 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 1PDOIN-0002PA-Ut for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 22:21:32 +0100 Original-Received: from localhost ([127.0.0.1]:37124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDOIN-0000hU-2w for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 17:21:31 -0400 Original-Received: from [140.186.70.92] (port=50353 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDOIG-0000hE-OR for emacs-devel@gnu.org; Tue, 02 Nov 2010 17:21:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDOIF-0002dq-67 for emacs-devel@gnu.org; Tue, 02 Nov 2010 17:21:24 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:44315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDOIE-0002d4-S5 for emacs-devel@gnu.org; Tue, 02 Nov 2010 17:21:23 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id oA2LLJri007511; Tue, 2 Nov 2010 17:21:19 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 0C1D5B40E9; Tue, 2 Nov 2010 17:21:19 -0400 (EDT) In-Reply-To: <8762wfilec.fsf@telefonica.net> (=?iso-8859-1?Q?=22=D3scar?= Fuentes"'s message of "Tue, 02 Nov 2010 20:19:07 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3667=0 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:132302 Archived-At: > It is desirable that patches not intended for trunk should never be on > trunk. Most/all patches on emacs-23 which shouldn't be merged to trunk are like that because trunk already has those patches (tho typically in a slightly different form, e.g. in a different file). Stefan