From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bojan Nikolic Newsgroups: gmane.emacs.devel Subject: Re: Merge in revno 100770 Date: Thu, 15 Jul 2010 22:37:47 +0100 Message-ID: <877hkwifys.fsf@bnikolic.co.uk> References: <83r5j4g0o1.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1279260210 5774 80.91.229.12 (16 Jul 2010 06:03:30 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 16 Jul 2010 06:03:30 +0000 (UTC) Cc: Eli Zaretskii , Chong Yidong , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jul 16 08:03:28 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.69) (envelope-from ) id 1OZe0e-0008AM-5Y for ged-emacs-devel@m.gmane.org; Fri, 16 Jul 2010 08:03:25 +0200 Original-Received: from localhost ([127.0.0.1]:33406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZe0R-0003nJ-PY for ged-emacs-devel@m.gmane.org; Fri, 16 Jul 2010 02:02:43 -0400 Original-Received: from [140.186.70.92] (port=37861 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZW81-0004lJ-1d for emacs-devel@gnu.org; Thu, 15 Jul 2010 17:38:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZW7y-0000yM-MK for emacs-devel@gnu.org; Thu, 15 Jul 2010 17:38:00 -0400 Original-Received: from out1.smtp.messagingengine.com ([66.111.4.25]:49498) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZW7v-0000xe-7E; Thu, 15 Jul 2010 17:37:55 -0400 Original-Received: from compute2.internal (compute2.internal [10.202.2.42]) by gateway1.messagingengine.com (Postfix) with ESMTP id BAB9116FD2A; Thu, 15 Jul 2010 17:37:52 -0400 (EDT) Original-Received: from heartbeat2.messagingengine.com ([10.202.2.161]) by compute2.internal (MEProxy); Thu, 15 Jul 2010 17:37:52 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com; h=from:to:cc:subject:references:date:in-reply-to:message-id:mime-version:content-type; s=smtpout; bh=ih9Smjyc/VhTvrgjLHlv/mg4pNs=; b=M435soGTw5Bg6a5TJoOmIBRlwPPy7Ny8PYFv7KCZZOxyGVIMUp28nFDtz6i9OxgtaGQaUet1oWrxvsdohnttaRbzkhdhkgW9hwco75SzjXeoqgfydDsu2+4pwRTzupu4Fg6kLIK6xWMjHOijaL5YsxFHM4FfMYcSYRk97gIqzCE= X-Sasl-enc: FzED1zJnIrSsnmshFjH2wouuPPiJA9EHBQEM1Ckh8PuZ 1279229872 Original-Received: from bnikolic-laptop (cable-188-2-162-137.dynamic.sbb.rs [188.2.162.137]) by mail.messagingengine.com (Postfix) with ESMTPSA id CB5066D91B; Thu, 15 Jul 2010 17:37:51 -0400 (EDT) In-Reply-To: (Andreas Schwab's message of "Thu, 15 Jul 2010 19:17:34 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Fri, 16 Jul 2010 02:02:35 -0400 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:127409 Archived-At: Andreas Schwab writes: > Eli Zaretskii writes: > >> Do we know how could that happen? > > It looks like a wrong conflict resolution. You can see the actual > conflicts with > > git show 036075de6587c79f9b609a68ddf4be09bd3a05ef src/fringe.c > Maybe there is a better way, but you can replay this situation in bzr by itself with the following sequence of commands: # Check-out of tree as it was just before the problematic merge. I # assume in current working directory, the directory "trunk" contains # the emacs trunk branch. If not replace "trunk/" by for example # lp:emacs bzr co -r 100769 trunk/ merge-problem-explain # Replay the merge cd merge-problem-explain bzr merge -r 99634.2.281 ../trunk/ ..... other output............ Text conflict in src/fringe.c .... other output .......... If you look at the conflict t is easy to see how it can have been resolved incorrectly. A suggestion related to this: I would recommend running merge with the "--show-base" option (if this isn't what you do anyway). In this the conflict would have been displayed as: ,---- | <<<<<<< TREE | left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p); | else if ((!row->reversed_p && MATRIX_ROW_CONTINUATION_LINE_P (row)) | || (row->reversed_p && row->continued_p)) | ||||||| BASE-REVISION | left = LEFT_FRINGE (3, Qbottom, row->ends_at_zv_p); | else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) | ======= | { | left = LEFT_FRINGE (3, Qbottom, bot_row_ends_at_zv_p); | if (bot_ind_max_y >= 0) | left_offset = bot_ind_max_y - (row->y + row->visible_height); | } | else if (MATRIX_ROW_CONTINUATION_LINE_P (row)) | >>>>>>> MERGE-SOURCE `---- making it rather easier to understand the conflict. Best, Bojan -- Bojan Nikolic || http://www.bnikolic.co.uk