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 16:47:46 +0100 Message-ID: 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> 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 1264434554 27271 80.91.229.12 (25 Jan 2010 15:49:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 15:49:14 +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 16:49:06 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 1NZRBR-0000Va-8q for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 16:48:57 +0100 Original-Received: from localhost ([127.0.0.1]:58805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZRBS-0000cK-JS for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 10:48:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZRAb-0008ED-AJ for emacs-devel@gnu.org; Mon, 25 Jan 2010 10:48:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZRAW-00089D-C9 for emacs-devel@gnu.org; Mon, 25 Jan 2010 10:48:04 -0500 Original-Received: from [199.232.76.173] (port=38213 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZRAW-00088t-5e for emacs-devel@gnu.org; Mon, 25 Jan 2010 10:48:00 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:54755) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZRAV-0006dc-OF for emacs-devel@gnu.org; Mon, 25 Jan 2010 10:47:59 -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 C73C41C15848; Mon, 25 Jan 2010 16:47:58 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 93A43901FE; Mon, 25 Jan 2010 16:47:58 +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 MzgJng253lyC; Mon, 25 Jan 2010 16:47:57 +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 16:47:47 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id CF3C2CA296; Mon, 25 Jan 2010 16:47:46 +0100 (CET) X-Yow: My polyvinyl cowboy wallet was made in Hong Kong by Montgomery Clift! In-Reply-To: <877hr61c68.fsf@telefonica.net> (=?utf-8?Q?=22=C3=93scar?= Fuentes"'s message of "Mon, 25 Jan 2010 15:39:27 +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:120376 Archived-At: Óscar Fuentes writes: > There is no concept of "big merge" on bzr. (nor on git, AFAIK) If you merge a long development branch, then that's a big merge. > So either you include the merged revisions and cope with unstable > intermediate points or you ignore them, locate the merge point where > the problem was introduced on mainline, and then proceed to bisect the > branch that originated that merge point. That's exactly what bisect does, automagically. If you are careful with your history, then this just works. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."