[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: martin rudalics
Subject: Re: Missing changes in merges from emacs-25 to master
Date: Sun, 20 Mar 2016 20:15:38 +0100

> What is fbce4757a874cc43806eb41b8637538b101c3c69, and how is it
> related to the issue?

It's the last commit before 82b089783e71b2aeef950eaecfe4cbc0735e64a2
that affects window.c (if I can trust C-x v l in this regard).

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


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

> My problem is that "git log -L" doesn't show my change at all,
> although searching through "git log src/window.c" I do see it.  So I'm
> inclined to trust nothing I see about this particular matter.  E.g.,
> are we sure this didn't happen as part of the merges from emacs-25?

I'm quite confident that it did happen as part of these merges.  That's
why I asked for clarification.  I mentioned earlier here that IMO some
commits were lost during the merges, but this change (and that of the
comment that precedes it) are the first ones I could locate.  I have no
idea how to find the merge that caused the loss of these two changes.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]