Jakub Narebski wrote: > 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon May 01 01:23:31 2006
This archive was generated by hypermail 2.1.8 : 2006-05-01 01:23:51 EST