Thread (7 messages) flat view 7 messages, 2 authors, 2016-06-15

Re: [RFC] cherry-pick using multiple parents to implement -x

From: Stephen R. van den Berg <hidden>
Date: 2016-06-15 22:45:19

Jeff King wrote:
On Sun, Sep 07, 2008 at 10:22:02PM +0200, Stephen R. van den Berg wrote:
quoted
quoted
But then it will fail to find legitimate merge bases. So yes, you _can_
quoted
Will it?  Can you give me one example where it would find the wrong one?
How about the example I gave already? The first merge-base is E, but
that is not correct for the merge I gave. So you propose an algorithm
which will find A. But now imagine the exact some topology, but there
was no cherry-pick; instead, E' is actually a merge. Wouldn't E be the
right merge-base then?
Indeed.  Q.E.D.
I'll drop the idea with the parentlinks.
-- 
Sincerely,
           Stephen R. van den Berg.
The Horkheimer Effect: "The odds of it being cloudy are directly proportional
to the importance of an astronomical event."
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help