From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 19:31:24 +0100 Message-ID: References: <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> <87aaw2yrec.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1264444343 32702 80.91.229.12 (25 Jan 2010 18:32:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 18:32:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 19:32:15 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 1NZTjC-00025A-OZ for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 19:31:59 +0100 Original-Received: from localhost ([127.0.0.1]:52539 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZTjD-0002Q6-V7 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:31:59 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZTim-0001wn-DI for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:31:32 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZTih-0001qo-M3 for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:31:31 -0500 Original-Received: from [199.232.76.173] (port=45875 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZTih-0001qY-Ew for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:31:27 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:51188) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZTig-0002bM-Ue for emacs-devel@gnu.org; Mon, 25 Jan 2010 13:31:27 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id F125C1C00116; Mon, 25 Jan 2010 19:31:25 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id D4D5090174; Mon, 25 Jan 2010 19:31:25 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id dVi61gwyf0aR; Mon, 25 Jan 2010 19:31:25 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.176.225.ip-pool.NEFkom.net [83.171.176.225]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jan 2010 19:31:25 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 01BBDCA296; Mon, 25 Jan 2010 19:31:24 +0100 (CET) X-Yow: Civilization is fun! Anyway, it keeps me busy!! In-Reply-To: <87aaw2yrec.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Mon, 25 Jan 2010 19:24:11 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120385 Archived-At: =C3=93scar Fuentes writes: > 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 (a= s > 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. That does not help if the bug is buried in the other part. Andreas. --=20 Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED= 5 "And now for something completely different."