From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Mon, 21 Mar 2016 10:55:27 -0700 Organization: UCLA Computer Science Department Message-ID: <56F0358F.7000103@cs.ucla.edu> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <56EFBD68.1050307@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458583004 8147 80.91.229.3 (21 Mar 2016 17:56:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Mar 2016 17:56:44 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 21 18:56:38 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ai447-0001IX-UU for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 18:56:32 +0100 Original-Received: from localhost ([::1]:59544 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai447-0006oG-Hv for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 13:56:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai43C-00061U-PF for emacs-devel@gnu.org; Mon, 21 Mar 2016 13:55:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai43B-0000Sz-Sr for emacs-devel@gnu.org; Mon, 21 Mar 2016 13:55:34 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:42522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai437-0000RY-Jo; Mon, 21 Mar 2016 13:55:29 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id C7BDF160175; Mon, 21 Mar 2016 10:55:28 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id FxOUszEf7P4S; Mon, 21 Mar 2016 10:55:27 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 96E45160843; Mon, 21 Mar 2016 10:55:27 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id UUmSK6jcTg8Q; Mon, 21 Mar 2016 10:55:27 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 7347A160175; Mon, 21 Mar 2016 10:55:27 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <56EFBD68.1050307@gmx.at> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:202016 Archived-At: martin rudalics wrote: > Thanks for the forensics. I have no idea which tools to use to trace > such a path. You might try gitk. It's not perfect, but it beats 'git log' for this sort of thing. > One thing that stupefies me is that in > > commit fbce4757a874cc43806eb41b8637538b101c3c69 > Author: Alan Mackenzie > Date: Sun Jan 24 20:30:39 2016 +0000 > > which IIUC follows the commits you cited above, the "correct" version is > still there why it should have been already lost at least on January 20. That patch was applied after the problematic merge e6d575316a42946aac6d83c9587f09afd1a59d98 that propagated the problems I identified in my previous email, so it is immune to those problems. Specifically, the problematic merge combined fef1b3066ae02ec6dd37b0358905491fabbedfdf (which did not have the problem) and 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa (which did have the problem), whereas the commit you cite is an immediate child of fef1b3066ae02ec6dd37b0358905491fabbedfdf and was therefore applied in the next merge (cb4e054e41cdb7e398351a5ae8224759e721349e).