From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Davis Herring" Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Tue, 2 Nov 2010 10:44:07 -0700 (PDT) Message-ID: <59302.130.55.118.19.1288719847.squirrel@webmail.lanl.gov> 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> <87lj5cjofg.fsf@telefonica.net> <87hbfzkdy3.fsf@telefonica.net> Reply-To: herring@lanl.gov NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1288719967 23578 80.91.229.12 (2 Nov 2010 17:46:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 17:46:07 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar_Fuentes?= , emacs-devel@gnu.org To: "Stefan Monnier" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 18:46:01 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 1PDKvi-0007cF-H1 for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 18:45:54 +0100 Original-Received: from localhost ([127.0.0.1]:59807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDKvh-00068t-Rn for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 13:45:53 -0400 Original-Received: from [140.186.70.92] (port=60843 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDKvZ-000681-JE for emacs-devel@gnu.org; Tue, 02 Nov 2010 13:45:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDKvY-0004B8-MF for emacs-devel@gnu.org; Tue, 02 Nov 2010 13:45:45 -0400 Original-Received: from proofpoint1.lanl.gov ([204.121.3.25]:40113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDKvY-0003qc-CO for emacs-devel@gnu.org; Tue, 02 Nov 2010 13:45:44 -0400 Original-Received: from mailrelay2.lanl.gov (mailrelay2.lanl.gov [128.165.4.103]) by proofpoint1 (8.14.3/8.14.3) with ESMTP id oA2Hi7uG017180; Tue, 2 Nov 2010 11:44:07 -0600 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by mailrelay2.lanl.gov (Postfix) with ESMTP id 3DC131A8BA75; Tue, 2 Nov 2010 11:44:07 -0600 (MDT) X-NIE-2-Virus-Scanner: amavisd-new at mailrelay2.lanl.gov Original-Received: from webmail1.lanl.gov (webmail1.lanl.gov [128.165.4.106]) by mailrelay2.lanl.gov (Postfix) with ESMTP id 2AC891A8BA70; Tue, 2 Nov 2010 11:44:07 -0600 (MDT) Original-Received: by webmail1.lanl.gov (Postfix, from userid 48) id 289A81CA8331; Tue, 2 Nov 2010 11:44:07 -0600 (MDT) Original-Received: from 130.55.118.19 (SquirrelMail authenticated user 196434) by webmail.lanl.gov with HTTP; Tue, 2 Nov 2010 10:44:07 -0700 (PDT) In-Reply-To: User-Agent: SquirrelMail/1.4.8-5.el5_4.10.lanl3 X-Priority: 3 (Normal) Importance: Normal X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.2.15, 1.0.148, 0.0.0000 definitions=2010-11-02_07:2010-11-02, 2010-11-02, 1970-01-01 signatures=0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:132288 Archived-At: > Another problem with your branch approach is that a patch applied > (mistakenly) to emacs-23 rather than to emacs-common would end up lost. > It's a lot easier to detect excess patches and lost patches. Could we restrict emacs-23 so that only the merges (and explicit maintainer action) could update it? The number of branch-only patches is small; it might not be too much trouble to rely on just a few people to commit them. Davis -- This product is sold by volume, not by mass. If it appears too dense or too sparse, it is because mass-energy conversion has occurred during shipping.