Eric Blake <ebb9 <at> 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 commit created that situation):
It stems from the fact that I had two similar commits on different branches
(the commits were not identical, but the effect to ChangeLog was):
git show aacc94
git show 37222e
then I merged those branches without consolidating identical ChangeLog entries:
git show 9ecd0a
And trying to reproduce it shows that even today's git-merge-changelog will
still happily create this situation of duplicate entries:
$ git branch stackovf 6864b6f
$ git checkout 08dd3b2
$ GIT_TRACE=2 git merge stackovf
trace: built-in: git 'merge' 'stackovf'
trace: run_command: 'sh' '-c' 'git-merge-changelog --split-merged-
entry .merge_file_aFw2Wz .merge_file_eeARjO .merge_file_mO9slg'
Auto-merging ChangeLog
Auto-merging NEWS
CONFLICT (content): Merge conflict in NEWS
Auto-merging checks/check-them
Auto-merging checks/get-them
Auto-merging doc/m4.texinfo
Auto-merging examples/Makefile.am
Removing examples/stackovf.sh
Auto-merging src/m4.c
Removing src/stackovf.c
Automatic merge failed; fix conflicts and then commit the result.
$ grep 'Fix missing' ChangeLog
Fix missing copyright notices.
Fix missing copyright notices.
$
--
Eric Blake
