From: Sean <seanlkml@sympatico.ca>
Date: Sun, 15 May 2005 22:47:43 GMT
Subject: Re: [RFC] adding merge-node to parent lines in a commit
Message-ID: <1522.10.10.10.24.1116197263.squirrel@linux1>
In-Reply-To: <7v64xkqfqg.fsf@assigned-by-dhcp.cox.net>

On Sun, May 15, 2005 6:36 pm, Junio C Hamano said:
>>>>>> "S" == Sean  <seanlkml@sympatico.ca> writes:
>
> S> Yes, it's pretty basic unless i'm overlooking something:
>
>     Rn---\
>          Mn
>          Mn-1
>     Rn-1  |
>     Rn-2  |
>     Rn-3--/
>     Initial
>
> S> So for this particular case it's rather simple, the Rn merge
> S> node would have:
>
> S> parent  Rn-1  (ommitted)
> S> parent  Mn    Rn-3
>
> Isn't that something you can obtain by scanning the parents and
> running merge-base across them without recording it in the
> commit?

Yes it is, and i was mistaken to think it gave more information.  It would
shave some time off history traversal, but nothing else.

Sean