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 11:51:19 +0100 Message-ID: References: <83vdeq634g.fsf@gnu.org> <83sk9u5wes.fsf@gnu.org> <83r5pe5vdr.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 1264416944 25579 80.91.229.12 (25 Jan 2010 10:55:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 10:55:44 +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 11:55: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 1NZMbW-00028P-Rn for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 11:55:35 +0100 Original-Received: from localhost ([127.0.0.1]:49363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZMbX-0008P9-CZ for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 05:55:35 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZMXa-0005Zg-2P for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:51:30 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZMXV-0005V6-0S for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:51:29 -0500 Original-Received: from [199.232.76.173] (port=46418 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZMXU-0005Ub-OU for emacs-devel@gnu.org; Mon, 25 Jan 2010 05:51:24 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:51812) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZMXS-0007D2-Qd; Mon, 25 Jan 2010 05:51:23 -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 8F2D31C0026B; Mon, 25 Jan 2010 11:51:21 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 4DC4F9019F; Mon, 25 Jan 2010 11:51:21 +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 80Vlk9IVxYqD; Mon, 25 Jan 2010 11:51:20 +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 11:51:20 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 501) id 1FD0BCA298; Mon, 25 Jan 2010 11:51:20 +0100 (CET) X-Yow: .. ich bin in einem dusenjet ins jahr 53 vor chr... ich lande im antiken Rom... einige gladiatoren spielen scrabble... ich rieche PIZZA... In-Reply-To: <83r5pe5vdr.fsf@gnu.org> (Eli Zaretskii's message of "Mon, 25 Jan 2010 12:30:56 +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:120349 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: mhershberger@intrahealth.org, emacs-devel@gnu.org >> Date: Mon, 25 Jan 2010 11:19:03 +0100 >> >> Eli Zaretskii writes: >> >> >> Not much different from >> >> eg. yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. >> > >> > That merge is made of Katsumi Yamaoka's changes. >> >> I don't understand that sentence. Can you clarify? > > Compare the names of committers and log messages in this: > > 99377.1.10: Katsumi Yamaoka 2010-01-21 [merge] (Score File Format): Fix typo. That's not yamaoka@jpl.org-20100121085911-ix6bp10z930y7zn8. >> > Which is not true for Mark's merge. >> >> Both commits merge trunk into a branch. How are they different? > > Mark's branch seems to include commits that I think belong to > mainline. Just like the other one. That's the whole point of merging trunk. 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."