From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 16:22:56 +0200 Message-ID: <83iqaq5kn3.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> <87sk9ufmgd.fsf@mithlond.arda> <83k4v65r51.fsf@gnu.org> <87hbqafhnr.fsf@mithlond.arda> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264429543 2087 80.91.229.12 (25 Jan 2010 14:25:43 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 14:25:43 +0000 (UTC) Cc: emacs-devel@gnu.org To: Teemu Likonen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 15:25:36 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 1NZPsl-0007bT-RT for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 15:25:36 +0100 Original-Received: from localhost ([127.0.0.1]:58442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPsm-0006MZ-Vj for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 09:25:37 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZPqW-0005jA-2y for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:23:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZPqR-0005hI-9u for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:23:15 -0500 Original-Received: from [199.232.76.173] (port=36191 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZPqR-0005hD-5z for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:23:11 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:64585) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZPqQ-0008AM-FC for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:23:10 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZPqF-0003II-7K for emacs-devel@gnu.org; Mon, 25 Jan 2010 09:22:59 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWT00C003TLD400@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Mon, 25 Jan 2010 16:22:55 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.180.161]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWT00BH23Y6AB40@a-mtaout22.012.net.il>; Mon, 25 Jan 2010 16:22:55 +0200 (IST) In-reply-to: <87hbqafhnr.fsf@mithlond.arda> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by mx20.gnu.org: Solaris 10 (beta) 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:120371 Archived-At: > From: Teemu Likonen > Cc: emacs-devel@gnu.org > Date: Mon, 25 Jan 2010 15:17:12 +0200 > > 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 Thanks. So now I understand that the conflict was only in the ChangeLog files (as expected). Also, revno 99379 included several unrelated changes. Am I confused or did we agree to avoid that?