From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 12:09:09 -0500 Message-ID: <87sk9s6bey.fsf@red-bean.com> References: <87iqaqyy6s.fsf@telefonica.net> <87eileys7h.fsf@telefonica.net> <87aaw2yrec.fsf@telefonica.net> <87r5pexbm6.fsf@telefonica.net> <87my02xa5l.fsf@telefonica.net> <87iqaqx81j.fsf@telefonica.net> <87eildyj1q.fsf@telefonica.net> <87aaw1ydqy.fsf@telefonica.net> <87r5pc7v88.fsf@red-bean.com> <87sk9su6vt.fsf@xemacs.org> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264527356 31593 80.91.229.12 (26 Jan 2010 17:35:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 17:35:56 +0000 (UTC) Cc: ofv@wanadoo.es, Eli Zaretskii , Stefan Monnier , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 18:35:48 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.50) id 1NZpKG-0001aL-Dy for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 18:35:44 +0100 Original-Received: from localhost ([127.0.0.1]:60742 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpKF-0007SU-Gf for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 12:35:39 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZouu-0003GS-7A for emacs-devel@gnu.org; Tue, 26 Jan 2010 12:09:28 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZoup-0003AE-QL for emacs-devel@gnu.org; Tue, 26 Jan 2010 12:09:27 -0500 Original-Received: from [199.232.76.173] (port=53068 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZoup-00039u-HW for emacs-devel@gnu.org; Tue, 26 Jan 2010 12:09:23 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:4067) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZoum-0002Io-18; Tue, 26 Jan 2010 12:09:20 -0500 Original-Received: from sanpietro.red-bean.com ([66.146.206.141]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZoul-0003j0-7f; Tue, 26 Jan 2010 12:09:19 -0500 Original-Received: from localhost ([127.0.0.1]:37595 helo=kfogel-work ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.71) (envelope-from ) id 1NZoud-0005nn-Jy; Tue, 26 Jan 2010 11:09:11 -0600 In-Reply-To: <87sk9su6vt.fsf@xemacs.org> (Stephen J. Turnbull's message of "Wed, 27 Jan 2010 02:13:10 +0900") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.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:120449 Archived-At: "Stephen J. Turnbull" writes: >Karl Fogel writes: > > > Is the problem that some people are saying that all the internal commits > > on your local branch should be clean & buildable & lint-free, in > > addition to the final merge being similarly clean? > >Nobody is saying that. What some people are saying is that all >*external* commits you push to a *global* repository should be clean >and/or buildable and/or lint-free. AFAIK Linux demands that, and I'm >sure there are other projects that do, although I don't know of them >offhand. I might have mis-used terminology. What I meant was: No developer should leave the tip of the public mainline in a broken state. Do we demand something stricter than that?