On Fri, Aug 26, 2005 at 06:08:33PM -0700, Junio C Hamano wrote: > Linus Torvalds <[EMAIL PROTECTED]> writes: > > > On Fri, 26 Aug 2005, Fredrik Kuivinen wrote: > >> > >> In real numbers it is as follows: In Linus' kernel tree there are > >> 5996 commits. 400 of those have more than one parent. Of those 400 > >> merge commits 4 have more than one shared head. > > > > Ok, that's already interesting in itself. I was wanting to re-run all the > > merges with the new "git-merge-base -a" to see which merges might have had > > different merge bases, and you've actually done that. Interesting to see > > the numbers. > > Fredrik, mind giving us the commit ID of those four for us to > take a look at them?
Sure, they are: 467ca22d3371f132ee225a5591a1ed0cd518cb3d which has two shared heads 7e2987503dda95a5f80290bb8c06279009c2419e and eff910a91ac04ab1d9e210d4f721484af3b39c8d 0e396ee43e445cb7c215a98da4e76d0ce354d9d7 with the heads 462cee296476278acaa54c41925b3273e0e4dd40 and 8be3de3fd8469154a2b3e18a4712032dac5b4a53 3190186362466658f01b2e354e639378ce07e1a9 with 38d84c3bd6dd22bdb1f797c87006931133d71aea and 46906c4415f88cebfad530917bada0835d651824 and finally da28c12089dfcfb8695b6b555cdb8e03dda2b690 with 9e566d8bd61f939b7f5d7d969f5b178571471cf9 and 18190cc08d70a6ec8ef69f0f6ede021f7cb3f9b8 (The script which finds those commits also prints out the commit id of any octopus commits. There is one commit with more than two parents in the kernel repository, 13e652800d1644dfedcd0d59ac95ef0beb7f3165. However, it only looks like that commit has three parents, two of them are actually identical.) > > I am of two minds on this. I hate the notion of a more complex merge. But > > at the same time, it clearly is a very interesting case when we do have > > multiple possible shared parents, and I think that at the very least we > > should warn the user. And using a more complex merge algorithm when it > > happens seems to be a very valid thing to do. > > I agree. GIT is lightening fast for trivial cases and we can > afford to spend more time to handle more complex ones carefully, > at the same time telling the user what we are doing is a good thing. > > > Using python, which people have less exposure to, sounds like an > > additional thorny issue.. > > Not too big a problem for me to follow the patch ;-). > Good to know :) I mainly wanted to try the idea with the new algorithm, so some kind of high level language seemed like a good choice. - Fredrik - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html