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

[Stefan Monnier <monnier@iro.umontreal.ca>]

> I think I know what happened.  It goes like this:

Sounds like a good explanation, thank you.

>   . Phillip then said "git pull", followed by "git push".

That's a problem in itself, since it leads to annoying commit diffs that
repeat other things, and it changes "git log" ordering in confusing ways
(makes it seem like mainline's development is Philip's and when happened
on master during this time was done on a branch).

>   . When John merged all of that to master, bb0cd31 was skipped.
>     Skipping it omitted all the 9 commits that were merged by bb0cd31.
> So the question (to John) now becomes: why was bb0cd31 skipped?

Probably because it's a merge commit, so its commit message contains
"merge" which is in bzrmerge-skip-regexp.  We should probably remove
"merge" from bzrmerge-skip-regexp (and use "backport" as the main magic
keyword) or at least refine it to only match things like "don't merge".


        Stefan