Eric Blake byu.net> writes:
> 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 co
Eric Blake 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
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
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:
$ git clone git://git.sv.gnu.org/m4.git
$ cd m4
$ git r
Hi Eric,
And with this patch, you get decent performance.
$ time git cherry-pick cd172d9
Finished one cherry-pick.
[master d8ac2b5] Fix description of limits on diversions.
3 files changed, 13 insertions(+), 5 deletions(-)
real0m0.425s
user0m0.300s
sys 0m0.128s
Now, can you show me
Hi Eric,
> Here's a sequence of steps, comparable to what I tried to use to generate
> 14b8a31ef on the master branch (cherry-picked from branch-1.6). The
> example below uses hashes instead of symbolic names, in case you want to
> reproduce this even when the branches have advanced. Notice that
