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 11:29:08 +0200 Message-ID: <83tyua5y8r.fsf@gnu.org> References: <83vdeq634g.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1264411966 9743 80.91.229.12 (25 Jan 2010 09:32:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 25 Jan 2010 09:32:46 +0000 (UTC) Cc: mhershberger@intrahealth.org, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 25 10:32:38 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 1NZLJG-0000Y6-7K for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 10:32:38 +0100 Original-Received: from localhost ([127.0.0.1]:47471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZLJH-00006z-Ba for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 04:32:39 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZLG4-0006qJ-0Q for emacs-devel@gnu.org; Mon, 25 Jan 2010 04:29:20 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZLFz-0006mW-97 for emacs-devel@gnu.org; Mon, 25 Jan 2010 04:29:19 -0500 Original-Received: from [199.232.76.173] (port=56792 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZLFz-0006mM-11 for emacs-devel@gnu.org; Mon, 25 Jan 2010 04:29:15 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:59073) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZLFw-0004a5-Q5; Mon, 25 Jan 2010 04:29:13 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KWS00L00ONLL300@a-mtaout22.012.net.il>; Mon, 25 Jan 2010 11:29:11 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.228.141.118]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KWS00HFQQCIX0E0@a-mtaout22.012.net.il>; Mon, 25 Jan 2010 11:29:07 +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:120341 Archived-At: > Cc: "Mark A. Hershberger" , emacs-devel@gnu.org > From: Glenn Morris > Date: Mon, 25 Jan 2010 03:46:51 -0500 > > 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? They are not actually applied twice, as far as the history is concerned. Try "bzr log -l100 -n0 --line": you will see them only once. But they do appear to be results of Mark's commit, which I think is incorrect. Or maybe I'm misinterpreting what "bzr log" shows. > 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 That might be a problem with the script that mails diffs upon commits. Or maybe it just does not show enough information, because evidently the original commits (by Stefen, Yidong, Dan, yourself etc.) got moved in the DAG from the mainline to a branch merge (again, if my interpretation of the log is correct). > Is this how it supposed to work? I don't think so. I suspect some local snafu on Mark's machine, with a subsequent fix that caused this strange history. Mark, can you enlighten us, please? (Btw, mhershberger@intrahealth.org bounces.)