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 12:08:43 +0200 Message-ID: <83sk9u5wes.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264414146 16733 80.91.229.12 (25 Jan 2010 10:09:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 10:09:06 +0000 (UTC) Cc: mhershberger@intrahealth.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 11:08:56 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 1NZLsM-0003AO-84 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 11:08:54 +0100 Original-Received: from localhost ([127.0.0.1]:44721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZLsN-0007tG-De for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 05:08:55 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZLsG-0007tB-IV for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:08:48 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZLsB-0007qw-LS for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:08:48 -0500 Original-Received: from [199.232.76.173] (port=35342 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZLsB-0007qt-FW for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:08:43 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:37671) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZLsB-0000o3-4f for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:08:43 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KWS00E00S2GFP00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Mon, 25 Jan 2010 12:08:42 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.228.141.118]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWS00DNAS6H7P40@a-mtaout20.012.net.il>; Mon, 25 Jan 2010 12:08:42 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:120343 Archived-At: > From: Andreas Schwab > Date: Mon, 25 Jan 2010 10:26:24 +0100 > Cc: "Mark A. Hershberger" , emacs-devel@gnu.org > > >> revno: 99379 [merge] > >> committer: Mark A. Hershberger > >> branch nick: trunk > >> timestamp: Sun 2010-01-24 23:52:26 -0500 > >> message: > >> merge conflict > > > > What does this "merge conflict" in the commit message mean? Why do > > so many unrelated files (see below) seem to be modified in one go? > > That's a normal merge of trunk into a branch. Yes, but the "merge conflict" commit message bears some meaning that I hope Mark will be able to explain. Obviously, that meaning is not something Bazaar would know about, or care. > Not much different from > eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. That merge is made of Katsumi Yamaoka's changes. Which is not true for Mark's merge. Thus my questions above.