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 15:39:27 +0100 Message-ID: <877hr61c68.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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264431045 14104 80.91.229.12 (25 Jan 2010 14:50:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 14:50:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 15:50:38 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 1NZQGz-0001ie-4r for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 15:50:37 +0100 Original-Received: from localhost ([127.0.0.1]:57300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZQH0-0000Zb-DV for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 09:50:38 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZQ6e-0000wa-7h for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:39:56 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZQ6Z-0000rH-3f for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:39:55 -0500 Original-Received: from [199.232.76.173] (port=53547 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZQ6Z-0000r3-0D for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:39:51 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:54430) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZQ6Y-0004fM-JJ for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:39:50 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NZQ6T-000675-Tg for emacs-devel@gnu.org; Mon, 25 Jan 2010 15:39:45 +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 15:39:45 +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 15:39:45 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 17 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:KkBvlzCRvYAc2QN2rMjFTtLeeSA= 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:120373 Archived-At: Andreas Schwab writes: >> For emacs purposes, you are interested on knowing *who* broke the build >> and *when* he incorporated the faulty change into upstream's trunk. > > It seems pretty useless if cannot find out which revision of a big merge > is to blame. The idea is to be able to say "Joe's revision X broke the build" and then is Joe's bussiness to determine which of the revisions he merged on the revision X broke the build. There is no concept of "big merge" on bzr. (nor on git, AFAIK) 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.