|
From: | Paul Eggert |
Subject: | Re: Missing changes in merges from emacs-25 to master |
Date: | Mon, 21 Mar 2016 10:55:27 -0700 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 |
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 <address@hidden> 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).
[Prev in Thread] | Current Thread | [Next in Thread] |