Subject: Re: [RFC] [PATCH 0/5] Implement 'prior' commit object links (and

From: Jakub Narebski <[email-masked]>
Date: Sun, 30 Apr 2006 17:21:37 +0200

Jakub Narebski wrote:

> Junio C Hamano wrote:
> 
>> Jakub Narebski <[email-masked]> writes:
>> 
>>>  * "prior" - heads that represent topic branch merges
>> 
>> This is not any different from usual "parent" at all (but you
>> have to think about it a bit to realize it).
> [cut]
> Thanks for an explanation.
> 
> I would say that "prior" is not THAT different from usual "parent",
> rather than it is not ANY different.
> 
> My doubts about recording previous head of a "union" (pu-like) branch
> is that for merge (e.g. 'pu' to 'next', cherrypick to/from 'pu', 'pu'
> rebase) is that for merge algorithm all parents are equivalent, with
> eventual exception of first which can be treated special ('ours').

Additionally with "prior" (or at least some convention on which of parents
is to prior head of "union (pu-like) branch) I think we could fast-forward
such branches...

-- 
Jakub Narebski
Warsaw, Poland