Re: Missing changes in merges from emacs-25 to master

[martin rudalics]

> You might try gitk. It's not perfect, but it beats 'git log' for this
> sort of thing.

I'm probably too silly but neither with gitk I can visualize the commit
that did reset

      m->total_cols = new_size;

to

      m->total_cols = size;

>  > 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).

I'm still lost.

(1) I do C-x v l in master's window.c.

(2) I go to the fragment

commit fbce4757a874cc43806eb41b8637538b101c3c69
Author: Alan Mackenzie <address@hidden>
Date:   Sun Jan 24 20:30:39 2016 +0000

and on the commit line I type 'f' which gets me a buffer called
window.c.~fbce4757a874cc43806eb41b8637538b101c3c69~.  Line 4079 of that
buffer shows

          m->total_cols = new_size;

Now IIUC this means that this line "was in master once".  Or am I wrong?

(3) Now I go to the fragment

commit 82b089783e71b2aeef950eaecfe4cbc0735e64a2
Merge: d27c807 f7dc6d8
Author: Paul Eggert <address@hidden>
Date:   Sat Jan 30 11:27:34 2016 -0800

and on the commit line I type 'f' which gets me a buffer called
window.c.~82b089783e71b2aeef950eaecfe4cbc0735e64a2~.  Line 4079 of that
buffer shows me

          m->total_cols = size;

Since as you said 82b089783e71b2aeef950eaecfe4cbc0735e64a2 is not the
offending commit there must have been a commit (on master) in between
the commits I cited above that did reset line 4079.  If so, how do I
find that offending commit?  Apparently "git log src/window.c" won't
find it which IIUC renders this command useless for tracking merges.

Neither do

git show 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa
git show cb4e054e41cdb7e398351a5ae8224759e721349e

show any changes to window.c.  And

git show 7823745acbe9b87eea2db4ef434e379fc903ec35

which you cited earlier as the culprit only tells me that

commit 7823745acbe9b87eea2db4ef434e379fc903ec35
Merge: 6acd2aa bb0cd31
Author: John Wiegley <address@hidden>
Date:   Mon Jan 18 22:56:33 2016 -0800

    ; Merge from origin/emacs-25

    The following commit was skipped:

    bb0cd31 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into 
emacs-25

So was that line that in (2) above apparently "was in master once"
removed silently?

martin