[RFC, PATCH] A new merge algorithm (EXPERIMENTAL)

2005-08-26 Thread Fredrik Kuivinen
Hi, I have for some time now been playing with a new merge algorithm. It is designed to solve some of the content merges that comes up now and then. For example the criss-cross merge case described by Bram Cohen [1], the similar case described by Matthias Urlichs [3] and the merge case Tony Luck

Re: [RFC, PATCH] A new merge algorithm (EXPERIMENTAL)

2005-08-26 Thread Fredrik Kuivinen
On Fri, Aug 26, 2005 at 04:48:32PM -0400, Daniel Barkalow wrote: On Fri, 26 Aug 2005, Fredrik Kuivinen wrote: I will try to describe how the algorithm works. The problem with the usual 3-way merge algorithm is that we sometimes do not have a unique common ancestor. In [1] B and C seems to

Re: [RFC, PATCH] A new merge algorithm (EXPERIMENTAL)

2005-08-26 Thread Linus Torvalds
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

Re: [RFC, PATCH] A new merge algorithm (EXPERIMENTAL)

2005-08-26 Thread Junio C Hamano
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

Re: [RFC, PATCH] A new merge algorithm (EXPERIMENTAL)

2005-08-26 Thread Fredrik Kuivinen
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