From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Tue, 26 Jan 2010 20:14:52 +0200 Message-ID: <837hr468df.fsf@gnu.org> References: <877hr61c68.fsf@telefonica.net> <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> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264529916 8682 80.91.229.12 (26 Jan 2010 18:18:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 18:18:36 +0000 (UTC) Cc: ofv@wanadoo.es, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 19:18:28 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 1NZpzg-0002e5-CZ for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 19:18:28 +0100 Original-Received: from localhost ([127.0.0.1]:57107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpzg-0006Rc-S3 for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 13:18:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZpwH-00020w-7V for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:14:57 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZpwC-0001ua-HG for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:14:56 -0500 Original-Received: from [199.232.76.173] (port=43069 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpwC-0001uM-66 for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:14:52 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:35695) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZpwB-0000im-K6 for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:14:51 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KWV00L009AS8C00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Tue, 26 Jan 2010 20:14:50 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWV00GFW9COREC0@a-mtaout20.012.net.il>; Tue, 26 Jan 2010 20:14:50 +0200 (IST) In-reply-to: <87r5pc7v88.fsf@red-bean.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:120457 Archived-At: > From: Karl Fogel > Cc: Stefan Monnier , ofv@wanadoo.es, emacs-devel@gnu.org > Date: Tue, 26 Jan 2010 10:15:51 -0500 > > 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? No, they say the internal commits should be cleaned up as to not show what they feel is ``noise'', whatever that means. > If so, I think that would be an unreasonable expectation, and not one > I've seen other projects enforce. Well, they say some projects do. But anyway, people talk; if we as a project do not require such practices, I think the head maintainers should say so loud and clear, to prevent such threads in the future. This is the second time (on my failing memory, at least) that this issue comes up in a long thread.