From: Stephen R. van den Berg Date: Mon, 08 Sep 2008 06:57:23 GMT Subject: Re: [RFC] cherry-pick using multiple parents to implement -x Message-ID: <20080908065723.GA29969@cuci.nl> In-Reply-To: <20080908014959.GA29129@coredump.intra.peff.net> Jeff King wrote: >On Sun, Sep 07, 2008 at 10:22:02PM +0200, Stephen R. van den Berg wrote: >> >But then it will fail to find legitimate merge bases. So yes, you _can_ >> 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."