From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Mon, 21 Mar 2016 10:22:48 +0100 Message-ID: <56EFBD68.1050307@gmx.at> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1458552204 9456 80.91.229.3 (21 Mar 2016 09:23:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Mar 2016 09:23:24 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 21 10:23:17 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 1ahw3P-0001WU-VH for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 10:23:16 +0100 Original-Received: from localhost ([::1]:56446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahw3P-0001df-79 for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 05:23:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahw3L-0001da-Bv for emacs-devel@gnu.org; Mon, 21 Mar 2016 05:23:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahw3K-0005VU-Iy for emacs-devel@gnu.org; Mon, 21 Mar 2016 05:23:11 -0400 Original-Received: from mout.gmx.net ([212.227.17.21]:61821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahw3F-0005Uv-4v; Mon, 21 Mar 2016 05:23:05 -0400 Original-Received: from [192.168.1.100] ([212.95.7.62]) by mail.gmx.com (mrgmx102) with ESMTPSA (Nemesis) id 0MFR2O-1acNbP1Kzc-00EL27; Mon, 21 Mar 2016 10:22:55 +0100 In-Reply-To: <56EFA47D.8020303@cs.ucla.edu> X-Provags-ID: V03:K0:eKjHCG3lL0s8wmHMg976hgW7mE8zqo4WtgMsWgu7wO3k+z/T7Vp XoCh9oMI3t/9xNxyWJqTSEwdvnXlPI5YF10vrrvUz++HVRZq4GSP7zB6iixGvqGdrHi5ou1 +EPHOcEHgMCwzXbAeLDqYpwUkWNn9sX5EseX7Qqi7yJvH9Pk/z/tObm2/E7Va1vp9JJAnlu 4QtewYUjhmk2xCXXTzMzQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:oq+XMzFCaTk=:WxQfQY0wdmdv8HWnNLXzjt zefbPXLZTg/PixyEglaErExg+yTSUQRCJdkIJIRF8EVQm7gOqtYprPD9+4by+tA25FgfrLB5o 0EwYMvMROwVqcayx5J1tMm11wNic4GoWeh9lNxBaMGRtEDBHtXhX0jok7qh8pJ8EFxJozjxH5 AkpRUoNfEi5n6jzXLzfBngUb71K0gjv/RqqWQiDrImXK8/TfKmLcYsHYYe0khBp7jvEYdZXvm DeK6VuDYSrCxSduhVmgjidZScmCFOcK8EcF3g8NGSiAN9Q+hQrYSv3XR3dt504KUN6gI2N0L6 u+fFmuei1FkTsZ/bEbQ/2i50UgqOVq2bf1WjRQzMNGz8Clno5JLxITx41+Ox8bzeat62HG6kA 9LR/EIOg56ZVYwM7B2vEIKe/PzJRi1j3RQkr1F4rZ6KVEPXDTDxqc8rMOx5beLupIlrlfOqiY gWoY+IV56roCfFH0A9MYhTmz4p9araKIVnG7I26kB7UIjGKA3+GqXCfTjpGSdnUt5PD7wGbBb YV35ksjx4OkoagOgXHElriMAIerqUJ/EUogzDw3gZuspQRKk+oLoXm5EWYVEBffxYIpbHDFhT xJf8KjIxnfWjlMCKccIl2G1nycLhEvEW22U2czbFXqkWZWs8RJN+WhPG6OaNU3uxKFa+6BOJu 3uWSRjixaUO6ag7WDTwwS4g9OfFOBVuzfq43pdBUDH+rZess3h8vGFmPJIhk1ONk5kuE7mcr/ JbQbAUcLUnyOInCuXMr4qZH6UJbpLyn1ag/HLqKXv2mQUj7447Sc106+5OP3NqG4AcFbgtna X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.21 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:201977 Archived-At: [...] > which in turn is a parent of: > > commit 1b76d9168336ede8976b980aeaed64ae2908501a > Merge: bca4930 2e5a89f > Author: John Wiegley > Date: Mon Jan 18 22:59:51 2016 -0800 > > - > > which in turn is a parent of: > > commit b895c72059521fec064ff27b4cfcfa4104081c4e > Merge: badcd38 1b76d91 > Author: Vincent Bela=C3=AFche > Date: Wed Jan 20 08:30:51 2016 +0100 > > Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs > > which leads via a long thin graph to the merge commit > 82b089783e71b2aeef950eaecfe4cbc0735e64a2 that you identified as losing= > the change. Thanks for the forensics. I have no idea which tools to use to trace such a path. 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. martin