From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master b6610d5 2/4: emacs-lisp/package.el: Refactor pre-execute prompt Date: Mon, 06 Apr 2015 19:03:16 +0200 Message-ID: <5522BC54.5000405@math.ntnu.no> References: <20150406102057.929.89886@vcs.savannah.gnu.org> <5522653C.5010608@yandex.ru> <837ftpldok.fsf@gnu.org> <83r3rxjqbx.fsf@gnu.org> <5522ADDD.7010303@math.ntnu.no> <5522BA5B.8070102@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1428339807 31052 80.91.229.3 (6 Apr 2015 17:03:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 17:03:27 +0000 (UTC) Cc: emacs-devel To: bruce.connor.am@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 19:03:26 2015 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 1YfAQn-0004jw-LA for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 19:03:25 +0200 Original-Received: from localhost ([::1]:40916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfAQm-0001u8-Rw for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 13:03:24 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfAQi-0001tt-SN for emacs-devel@gnu.org; Mon, 06 Apr 2015 13:03:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YfAQh-00083k-LT for emacs-devel@gnu.org; Mon, 06 Apr 2015 13:03:20 -0400 Original-Received: from hylle06.itea.ntnu.no ([2001:700:300:3::235]:49432) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YfAQh-00083g-CM for emacs-devel@gnu.org; Mon, 06 Apr 2015 13:03:19 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id E69AF66AD0B; Mon, 6 Apr 2015 19:03:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::c35:78d:c6ff:48e4] (unknown [IPv6:2001:4662:4ffb:0:c35:78d:c6ff:48e4]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 8779A66AD09; Mon, 6 Apr 2015 19:03:17 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <5522BA5B.8070102@math.ntnu.no> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:700:300:3::235 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:185049 Archived-At: Harald Hanche-Olsen wrote: > I don't understand. Say someone creates a branch foo from master. Then > each branch has several commits, and foo is merged into master. How do > you linearly order the commits that happened on the separate branches? Ah, but I am just being silly here. I got thrown by the name =E2=80=9Cbis= ect=E2=80=9D.=20 Of course, it doesn't always have to be bisection the way you do it in a=20 linear order! Instead, assuming the bug was introduced when the branches=20 were separate, the method needs to check the merge commit, and if the=20 bug is present there, check the commit where the branches diverged, and=20 if it is absent there, check the two branches separately. If there is more branching, do it recursively. This is not rocket=20 science. It's just the =E2=80=9Cbisect=E2=80=9D name that is misleading. Sorry about the noise. =E2=80=93 Harald