From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: merge conlict? Date: Mon, 25 Jan 2010 03:46:51 -0500 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 1264409267 1135 80.91.229.12 (25 Jan 2010 08:47:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 08:47:47 +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 09:47:34 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 1NZKbN-0001OD-92 for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 09:47:17 +0100 Original-Received: from localhost ([127.0.0.1]:40578 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZKbO-0006JS-Bl for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 03:47:18 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZKb3-00061G-9f for emacs-devel@gnu.org; Mon, 25 Jan 2010 03:46:57 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZKay-0005wx-QO for emacs-devel@gnu.org; Mon, 25 Jan 2010 03:46:56 -0500 Original-Received: from [199.232.76.173] (port=53230 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZKay-0005wl-H9 for emacs-devel@gnu.org; Mon, 25 Jan 2010 03:46:52 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]:40816) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZKay-0007y6-0V for emacs-devel@gnu.org; Mon, 25 Jan 2010 03:46:52 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NZKax-0002SP-IR; Mon, 25 Jan 2010 03:46:51 -0500 X-Spook: Lexis-Nexis Comirex quiche lynch Geraldton Medco MDA SAPO X-Ran: 1AARD4eEBetz,M~u8n-_hXzH$XJgI4MYC>j~p"U)WP6WM)u_,hyIAWsOBN88q`$"=%R$wi X-Hue: cyan X-Attribution: GM In-Reply-To: <83vdeq634g.fsf@gnu.org> (Eli Zaretskii's message of "Mon\, 25 Jan 2010 09\:43\:43 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:120337 Archived-At: Eli Zaretskii wrote: > 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? I'm confused by this too. The actual diffs seem to be a lot of recent changes being applied for a second time. I could understand if there was a message where they got unapplied first by mistake. But how can the same changes get applied twice to the trunk? Also, each of revs 99378-99381 now appears twice, referring to a different change each time. Eg these are both r99379: http://lists.gnu.org/archive/html/emacs-diffs/2010-01/msg00146.html http://lists.gnu.org/archive/html/emacs-diffs/2010-01/msg00106.html Is this how it supposed to work?