From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: Messing with the VC history Date: Wed, 19 Nov 2014 07:30:41 +0900 Message-ID: <874mtwuooe.fsf@uwakimon.sk.tsukuba.ac.jp> References: <87k32vsm8u.fsf@wanadoo.es> <83fvdjdv8t.fsf@gnu.org> <871tp3rv07.fsf@wanadoo.es> <87lhnavhz9.fsf@uwakimon.sk.tsukuba.ac.jp> <87ioiev7bp.fsf@uwakimon.sk.tsukuba.ac.jp> <85ppcl6knw.fsf@junk.nocrew.org> <878uj9uepz.fsf@uwakimon.sk.tsukuba.ac.jp> <20141118114747.242a35c7@anarchist.wooz.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1416349877 26606 80.91.229.3 (18 Nov 2014 22:31:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 22:31:17 +0000 (UTC) Cc: Barry Warsaw , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 23:31:10 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqrIj-00014t-Vd for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 23:31:10 +0100 Original-Received: from localhost ([::1]:55726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqrIj-0003TY-J5 for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 17:31:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqrIS-0003TI-0u for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:30:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqrIM-0000Cc-4r for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:30:51 -0500 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:34614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqrIL-0000CM-RJ for emacs-devel@gnu.org; Tue, 18 Nov 2014 17:30:46 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id F35A31C3A93; Wed, 19 Nov 2014 07:30:41 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id D2D2C1A2844; Wed, 19 Nov 2014 07:30:41 +0900 (JST) In-Reply-To: X-Mailer: VM undefined under 21.5 (beta34) "kale" acf1c26e3019 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177687 Archived-At: Andreas Schwab writes: > Barry Warsaw writes: > > > bisect would be more useful, IMHO, if it followed first-parents by default. > > Bisecting follows whatever you tell it about the good/bad state of > branches. No, bisecting has a choice of which of several paths to follow through a DAG between a branch point and a merge. Telling it "bisect between node and merge" doesn't help it make that choice. I don't know how git chooses, but Barry is saying that in a workflow where all mainline commits are either merge commits (for multiple- commit "complex feature" branches) or one-off (for "simple bugfix" commits), the bisect algorithm should follow the mainline (ie, first parents) and completely ignore off-mainline "component of feature" commits. I suspect that is in fact what git does, but don't have time to check.