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 13:48:49 +0100 Message-ID: <87my021ham.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> 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 1264425029 8537 80.91.229.12 (25 Jan 2010 13:10:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 13:10:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 13:50:22 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 1NZOOc-0006bg-7q for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 13:50:22 +0100 Original-Received: from localhost ([127.0.0.1]:47627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOOd-0004bm-DZ for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 07:50:23 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOOZ-0004aW-Ig for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:50:19 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZOOV-0004Vy-1W for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:50:19 -0500 Original-Received: from [199.232.76.173] (port=39100 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOOU-0004Vt-Uq for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:50:14 -0500 Original-Received: from impaqm2.telefonica.net ([213.4.138.2]:32039) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZOOU-0007Ey-IR for emacs-devel@gnu.org; Mon, 25 Jan 2010 07:50:14 -0500 Original-Received: from IMPmailhost4.adm.correo ([10.20.102.125]) by IMPaqm2.telefonica.net with bizsmtp id ZkoP1d0042iL0W23MooqXc; Mon, 25 Jan 2010 13:48:50 +0100 Original-Received: from qcore ([88.24.231.92]) by IMPmailhost4.adm.correo with BIZ IMP id Zoop1d00K20Fy201kooqBL; Mon, 25 Jan 2010 13:48:50 +0100 X-TE-authinfo: authemail="981711563$telefonica.net" |auth_email="981711563@telefonica.net" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" In-Reply-To: (Andreas Schwab's message of "Mon, 25 Jan 2010 13:34:23 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:120364 Andreas Schwab writes: > =C3=93scar Fuentes writes: > >> Unless you take the "technically" part as "no code was lost", I beg to >> differ. A simple `bzr log' will show that the commits of the last few >> days are gone from the listing. You need to add the `-n2' parameter to >> see them as merged history under Mark's commit. > > That's only a UI problem. A UI problem can be very serious. This one is. > There is nothing lost in terms of history. Right, but the history now is confusing: seems like a number of revisions for several people came from Mark's branch. >> Oh, and apart from this problem and producing a huge diff, it breaks >> bisection. > > How? While bisecting the DAG, either you remain on the left-most part, and then those revisions are ignored, or traverse the merged history too, and then you take into account lots of revisions which were intermediate local points on the development of some feature. Think how this affects to "find the revision that broke the build."