Linus Torvalds writes: > I think git itself is quite robust in the face of duplicate parents, and > it really is a gitk bug that it has problems with them. That said, I don't > think we should *assume* they don't happen, and while we should consider > it a bug in hg2git that they did, it is not a "serious" bug per se. It's > only gitk that reacts this violently to it. There has been a commit with duplicate parents in the kernel git tree for ages (13e65280), and gitk handles it just fine, so I don't think it's simply a problem with duplicate parents. I know gitk currently barfs if there are any dangling parents in the git log --parents --boundary output (i.e. any ids which are listed in the second or subsequent position on the commit lines but never in the first position). It shouldn't, and I'll fix it. It would be nice to know if it is actually dangling parents that is causing the problem, though. Paul. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
