Hi, Liraz Siri wrote:
> I've been investigating a merge bug in an unusually large Git repository > with over ten thousand commits. > > In older versions of the git-core package (the one in stable), > attempting to merge would raise a segmentation fault. In the latest > version from sid a slightly more useful error message is produced: > > BUG: There are unmerged index entries: > BUG: 2 [ ... snip file paths ...] Bug in merge-recursive.c > > The bug seems so have been fixed in the latest version of Git from > upstream (1.7.3.1) so I'm guessing once you update to that or a higher > version everything will be fine. Thanks! I'm cc-ing Elijah Newren, who's been doing work recently in this area (unhandled index entries that appear during directory/file conflicts). Elijah, is it safe to pull in the en/d-f-conflict-fix branch on top of v1.7.2.3, or are more fixes (e.g. from en/merge-recursive) needed in addition? (For the record, the relevant changes are: 8 files changed, 284 insertions(+), 24 deletions(-) ). I fear that it is unlikely this work can be included in Debian squeeze, but it might be worth proposing it anyway. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
