From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 22:24:33 +0100 Message-ID: <87eildyj1q.fsf@telefonica.net> References: <87636q2x2q.fsf@telefonica.net> <87my021ham.fsf@telefonica.net> <87iqaq1f09.fsf@telefonica.net> <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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1264454826 13671 80.91.229.12 (25 Jan 2010 21:27:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 21:27:06 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 22:26:58 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 1NZWSV-00027o-6T for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 22:26:55 +0100 Original-Received: from localhost ([127.0.0.1]:40551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZWSW-0000kY-5e for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 16:26:56 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZWQm-0008Sz-MY for emacs-devel@gnu.org; Mon, 25 Jan 2010 16:25:08 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZWQi-0008RS-UA for emacs-devel@gnu.org; Mon, 25 Jan 2010 16:25:08 -0500 Original-Received: from [199.232.76.173] (port=55505 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZWQi-0008RN-JQ for emacs-devel@gnu.org; Mon, 25 Jan 2010 16:25:04 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:39439) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZWQh-0006Ia-OO for emacs-devel@gnu.org; Mon, 25 Jan 2010 16:25:04 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZWQY-0000uC-W3 for emacs-devel@gnu.org; Mon, 25 Jan 2010 22:24:54 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 22:24:54 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 25 Jan 2010 22:24:54 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:qA0biAUNWIy8PTRLchYCNRTo6r8= X-detected-operating-system: by monty-python.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:120395 Archived-At: Andreas Schwab writes: > Óscar Fuentes writes: > >> You are not interested on bisecting my 3 commits branch that >> implemented a small feature, are you? > > Sure I am. If one of the 3 commits was the one that broke it. That's > the whole point of bisection. And wouldn't you happy enough knowing the commit that merged the 3 commits into trunk? It is very likely that if strict commit requirements are imposed on private branches, people will refrain from doing local commits at all. If you have to think hard and review and test before doing a local commit, you will delay it as much as possible, or completely avoid it. So, at the end, you have the same change on the left-most part of trunk, but after removing the convenience of local branches, with the subsequent impact on the fun/pace/relax people have hacking on Emacs. Speaking as a newbie Emacs hacker, it is very encouraging to have the possibility of working on some feature without worrying about breaking things until the final point where the change is considered ready for trunk. OTOH, having to keep every local commit up to trunk standards looks very stressing. Not mentioning that most non-trivial new features necessarily start on an unstable state.