Re: git-merge-changelog question

[Eric Blake]

Eric Blake <ebb9 <at> byu.net> writes:

> According to Bruno Haible on 7/2/2009 5:17 PM:
> > Now, can you show me a crashing situation, please (with either the old or 
the
> > new git-merge-changelog)?
> 
> Found one.  This crashes under the old:

And under the new.  It is triggering an ASSERT failure, and I've traced it to 
the fact that branch-1.4's ChangeLog has identical entries, and one entry from 
branch-1.6 refuses to map back to two entries of branch-1.4 (I'm now searching 
for which botched commit created that situation):

$ git checkout origin/branch-1.4
$ grep -B2 -A5 'Fix missing' ChangeLog 
2008-07-17  Eric Blake  <address@hidden>

        Fix missing copyright notices.
        * acinclude.m4: Add copyright license details.
        * c-boxes.el: Likewise.
        * checks/get-them: Likewise.
        * checks/check-them: Likewise.

--
2008-07-17  Eric Blake  <address@hidden>

        Fix missing copyright notices.
        * acinclude.m4: Add copyright license details.
        * c-boxes.el: Likewise.
        * checks/get-them: Likewise.
        * checks/check-them: Likewise.

-- 
Eric Blake