Re: Merging using only fast-forward

From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Jan 17, 2008, 06:53 UTC
Message-ID: <402c10cd0801162253n6ab19f51y53d0baa16319adaa@mail.gmail.com>
In-Reply-To: <7vwsq9o6ls.fsf@gitster.siamese.dyndns.org>

On Jan 16, 2008 12:31 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> merlyn@stonehenge.com (Randal L. Schwartz) writes:
>
> > Junio implemented a 7-line patch on the IRC channel (calling parts of it
> > "for randal" or something, I believe :) to do precisely this.
>
> The mechanism itself is simple.
>
>         http://git.pastebin.com/m156a1856

I know that the patch you wrote is not good. However, it is a good starting point.

We need to consider cases where the branch we are merging with is an ancestor or an descendant of HEAD. The patch only take descendants into account. There may also be more than one branch we are merging with. All these cases must be considered. In the case of an octopus, the cases are slightly more complicated.

I have a patch that work for all cases except for some octopus cases. I have written a few test case. All existing tests succeeds.

I will not be able to work on this for a few days, but I expect to have a working patch some time this weekend.

I have not looked at the documentation but assume it should not be to hard to add some documentation as well.

-- 
Sverre Hvammen Johansen