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:11:24 +0200 Message-ID: <838wbk68j7.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: ger.gmane.org 1264529720 7934 80.91.229.12 (26 Jan 2010 18:15:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 26 Jan 2010 18:15:20 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 19:15:12 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 1NZpwV-0001GW-So for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 19:15:12 +0100 Original-Received: from localhost ([127.0.0.1]:55780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpwX-0002Cl-3P for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 13:15:13 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZpsx-0006ps-3D for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:11:31 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZpss-0006iw-8q for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:11:30 -0500 Original-Received: from [199.232.76.173] (port=34140 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZpss-0006ih-4F for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:11:26 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:32873) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZpsr-0000Ig-N8 for emacs-devel@gnu.org; Tue, 26 Jan 2010 13:11:26 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWV00A0094B0900@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Tue, 26 Jan 2010 20:11:21 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWV005KT96VG3B0@a-mtaout22.012.net.il>; Tue, 26 Jan 2010 20:11:20 +0200 (IST) In-reply-to: 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:120456 Archived-At: > From: Stefan Monnier > Cc: ofv@wanadoo.es, emacs-devel@gnu.org > Date: Tue, 26 Jan 2010 10:11:34 -0500 >=20 > > I agree with =D3scar: this is a lot of potentially unnecessary wo= rk. >=20 > Who cares: it just describes my workflow, nothing more. If/when I = feel > like such a workflow should be turned into a convention that other > people should follow, rest assured that I'll do so in a separate th= read. Fine with me. But since this issue comes up time and again here, perhaps you should just say that, as a matter of policy, for now no such effort is required or expected when features are merged and committed to the trunk.