* Eric Blake wrote on Sat, Jan 24, 2009 at 02:00:15PM CET:
According to Ralf Wildenhues on 1/24/2009 2:37 AM:
One funny thing (funny strange, not haha) is that the ChangeLog entries
from master appeared in reverse order in the pr-msvc-support ChangeLog
after the merge, and I had to fix that up manually. Pure luck I noticed
that one...
Are you using the git-merge-changelog merge driver from gnulib?
If yes, then it's probably an artefact of that driver.
It also matters which branch is considered 'upstream' when running that
driver; it tries to place your edits at the top of the file, but depending
on which branch you are on at the time of the merge, it might guess wrong
on which entries qualify as your edits vs. upstream edits.
Ah yes, that sounds like it was the problem here. Surely that makes
criss cross merging (which we are effectively doing ATM) between two
branches a bit more fun. In the end, we might have to declare that the
order of, say, master, is the one we'd like to have. Maybe we can
enhance git-merge-changelog to allow for such a prioritisation (sp?).