From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Teemu Likonen Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 15:17:12 +0200 Message-ID: <87hbqafhnr.fsf@mithlond.arda> References: <83vdeq634g.fsf@gnu.org> <87sk9ufmgd.fsf@mithlond.arda> <83k4v65r51.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264425456 10172 80.91.229.12 (25 Jan 2010 13:17:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 13:17:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 14:17: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.50) id 1NZOoo-0002hO-KC for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 14:17:27 +0100 Original-Received: from localhost ([127.0.0.1]:39797 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOop-00078P-NT for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 08:17:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZOok-00077w-Bz for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:17:22 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZOof-00076p-Vf for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:17:22 -0500 Original-Received: from [199.232.76.173] (port=33360 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZOof-00076i-Kx for emacs-devel@gnu.org; Mon, 25 Jan 2010 08:17:17 -0500 Original-Received: from mta-out.inet.fi ([195.156.147.13]:33098 helo=jenni2.inet.fi) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZOob-0002d4-WB; Mon, 25 Jan 2010 08:17:14 -0500 Original-Received: from mithlond.arda (84.251.132.215) by jenni2.inet.fi (8.5.014) id 4B17EA3D0230B2F3; Mon, 25 Jan 2010 15:17:12 +0200 Original-Received: from dtw by mithlond.arda with local (Exim 4.69) (envelope-from ) id 1NZOoa-00036A-H8; Mon, 25 Jan 2010 15:17:12 +0200 In-Reply-To: <83k4v65r51.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Jan 2010 14:02:34 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) 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:120365 Archived-At: On 2010-01-25 14:02 (+0200), Eli Zaretskii wrote: >> $ git show b8de0d6 > > Please help me understand what you ``trivially'' see in this output. I > clearly see here changes not made by Mark, and having no Git knowledge > I cannot discern between the changes, because the format shown is not > exactly the Diff format. Sorry. There has probably been misunderstanding on my side too. One thing is the changes made by the merge commit itself. If there are no conflict resolution the merge commit doesn't add any changes of its own. Another thing is that what changes the merging as a whole brings from of the branches' point of view; this depends on how we look at it. I believe you are interested in the latter so let's look at the merge commit in question: $ bzr log --show-ids -r 99379 ------------------------------------------------------------ revno: 99379 [merge] revision-id: mhershberger@intrahealth.org-20100125045226-kdr44qlmgp2sfofu parent: mhershberger@intrahealth.org-20100119193922-csbqj8x71fiui8ax parent: monnier@iro.umontreal.ca-20100125025203-r430km4xq62rec7s committer: Mark A. Hershberger branch nick: trunk timestamp: Sun 2010-01-24 23:52:26 -0500 message: merge conflict ------------------------------------------------------------ There's are the revision IDs of this merge's parents. To see what changes the merge brought from former-trunk to Mark's branch: $ bzr diff -r \ revid:mhershberger@intrahealth.org-20100119193922-csbqj8x71fiui8ax..99379 Mark pushed this branch to the official Emacs branch on bzr.savannah.gnu.org so now it became the branch we call "trunk". To see what changes Mark made in his private branch and thus brought to the main development line: $ bzr diff -r \ revid:monnier@iro.umontreal.ca-20100125025203-r430km4xq62rec7s..99379 To see how Mark resolved the conflicting merge: $ git show b8de0d6 How to interpret Git's combined diff format is documented here: http://www.kernel.org/pub/software/scm/git/docs/git-diff.html