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

[Eli Zaretskii]

> From: address@hidden (Phillip Lord)
> Cc: John Wiegley <address@hidden>,  address@hidden,  address@hidden,  
> address@hidden
> Date: Tue, 22 Mar 2016 17:00:49 +0000
> 
> Eli Zaretskii <address@hidden> writes:
> >> But in these cases, the commit we lost should have been mentioned in
> >> the list of skipped one.  It wasn't, AFAICS.
> >
> > I think I know what happened.  It goes like this:
> >
> >   . Phillip worked on test selector for the test suite.  When he
> >     finished, he made a local commit 549a765 on the emacs-25 branch.
> >
> >   . Phillip then said "git pull", followed by "git push".  This
> >     produced the merge-commit bb0cd31, which incorporated 9 other
> >     commits that were pushed there since the time Phillip started
> >     working on 549a765.  One of these 9 commits was my commit that
> >     fixed resize_frame_windows.
> 
> Oh dear, should have made those changes on a branch and rebased from
> emacs-25.

It's not your fault.  Quite a few others (myself included) produce
these merge-commits from time to time, this cannot be avoided.  The
problem is in the merge procedure from emacs-25 to master -- it
shouldn't skip such merge-commits.