From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 10:26:24 +0100 Message-ID: References: <83vdeq634g.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 1264411716 8859 80.91.229.12 (25 Jan 2010 09:28:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 09:28:36 +0000 (UTC) Cc: "Mark A. Hershberger" , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 10:28:29 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 1NZLFB-0007SM-76 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 10:28:25 +0100 Original-Received: from localhost ([127.0.0.1]:42099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZLFC-0006II-7W for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 04:28:26 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZLDS-0005kU-7U for emacs-devel@gnu.org; Mon, 25 Jan 2010 04:26:38 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZLDN-0005he-S6 for emacs-devel@gnu.org; Mon, 25 Jan 2010 04:26:37 -0500 Original-Received: from [199.232.76.173] (port=50258 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZLDN-0005hT-MS for emacs-devel@gnu.org; Mon, 25 Jan 2010 04:26:33 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:60875) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZLDL-0004Fi-OC; Mon, 25 Jan 2010 04:26:31 -0500 Original-Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 703E51C15670; Mon, 25 Jan 2010 10:26:26 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 56C9A9032B; Mon, 25 Jan 2010 10:26:26 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan1.mnet-online.de [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id xoBkeoJBq0Mq; Mon, 25 Jan 2010 10:26:25 +0100 (CET) Original-Received: from igel.home (DSL01.83.171.176.225.ip-pool.NEFkom.net [83.171.176.225]) by mail.mnet-online.de (Postfix) with ESMTP; Mon, 25 Jan 2010 10:26:25 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 359F6CA298; Mon, 25 Jan 2010 10:26:25 +0100 (CET) X-Yow: I need "RONDO". In-Reply-To: <83vdeq634g.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Jan 2010 09:43:43 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) 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:120340 Archived-At: Eli Zaretskii writes: >> Date: Sun, 24 Jan 2010 23:52:26 -0500 >> From: "Mark A. Hershberger" >> To: emacs-diffs@gnu.org >> Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r99379: merge conflict >> Content-Type: text/plain; charset="us-ascii" >> >> ------------------------------------------------------------ >> 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. Not much different from eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."