-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Bruno Haible on 7/4/2009 3:26 AM: > Fix assertion. > * lib/git-merge-changelog.c (compute_mapping): In the case where file1 > contains more exact copies of a given entry than file2, leave the extra > copies unpaired rather than aborting. > Reported by Eric Blake.
Is it also worth addressing the root cause of this? After all, it was git-merge-changelog that created file1 with more than 1 exact copy in the first place (via the earlier round of merging); it seems like it would be better for git-merge-changelog to fail with a merge conflict if both contributors provide an identical entry surrounded by differing context, than to create a file with duplicate entries. - -- Don't work too hard, make some time for fun as well! Eric Blake e...@byu.net -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpPx4kACgkQ84KuGfSFAYBwdgCeMPKdVNSAJt9kvb+HMTX/csNc qT0AniTFbEno6Bm9kU0fsOAQeiQyuNq1 =e2dg -----END PGP SIGNATURE-----
