Thread (8 messages) flat view 8 messages, 5 authors, 2016-06-15

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

From: Jakub Narebski <hidden>
Date: 2016-06-15 22:42:24

Jakub Narebski wrote:
Junio C Hamano wrote:
quoted
Jakub Narebski [off-list ref] writes:
quoted
 * "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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help