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 19:24:11 +0100 Message-ID: <87aaw2yrec.fsf@telefonica.net> References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <87ljfm329g.fsf@telefonica.net> <87hbqa2zmf.fsf@telefonica.net> <87ockiflg2.fsf@mithlond.arda> <87636q2x2q.fsf@telefonica.net> <87my021ham.fsf@telefonica.net> <87iqaq1f09.fsf@telefonica.net> <877hr61c68.fsf@telefonica.net> <87iqaqyy6s.fsf@telefonica.net> <87eileys7h.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 1264443927 31092 80.91.229.12 (25 Jan 2010 18:25:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 18:25:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 19:25:20 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 1NZTcY-000733-6K for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 19:25:06 +0100 Original-Received: from localhost ([127.0.0.1]:59172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZTcZ-0001ci-AA for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:25:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZTcV-0001bs-0M for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:25:03 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZTcQ-0001Un-Au for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:25:02 -0500 Original-Received: from [199.232.76.173] (port=55995 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZTcQ-0001Ue-76 for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:24:58 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:55441) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZTcP-0001fy-O4 for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:24:58 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZTcF-0006nt-Os for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:24:47 +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 19:24:47 +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 19:24:47 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 18 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:Ie8fOmwtlAwl643S9zv59MxbVlg= 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:120383 Archived-At: Andreas Schwab writes: > Óscar Fuentes writes: > >> I do "bisect" maybe twice per year. I commit hundreds of times. Guess >> what's more convenient for me. > > What is more convenient for the community? For Emacs, I'm pretty sure that it is more convenient to have looser requirements for committing into private branches than to be able to bisect into merged history. Please note that it is not a question of bisect or not bisect. It is always possible to bisect following the leftmost part of the history (as long as people do not get accustomed to push their changes onto trunk and break that) and it is possible to re-create the original branch and bisect it.