Re: [RFC] [PATCH 0/5] Implement 'prior' commit object links (and
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Apr 30, 2006, 15:21 UTC
- Message-ID
- <e32kkf$amc$1@sea.gmane.org>
- In-Reply-To
- <e30k0n$ij5$1@sea.gmane.org>
Jakub Narebski wrote:
Show 18 quoted lines
> Junio C Hamano wrote:
>
>> Jakub Narebski <jnareb@gmail.com> 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