Re: More gitweb queries..

From: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Date: May 30, 2005, 01:33 UTC
Message-ID: <20050530013330.GI12290@cip.informatik.uni-erlangen.de>
In-Reply-To: <7voeatbkey.fsf@assigned-by-dhcp.cox.net>

Hello,

Show 5 quoted lines

> JCH>    - If MB is either BASE or H1, then you have a fast forward.
> JCH>      Take either BASE or H1 that is not MB and update variable
> JCH>      BASE with it, and update variable T with the tree
> JCH>      associated with it.  Continue with the loop (i.e. Perl
> JCH>      "next").

> Chuck this part please.  I was not thinking.

No, I don't because I think this exactly what I have to do here. And yes, there can be fast forwards. :-)

But note: On a fast forward condition we have to remove a element from
COMMIT_HEADS: the (last) or (last - 1). Depending on if 'local' ==
MERGE_BASE or 'remote' == MERGE_BASE.

	Thomas