Home » Mailing list archives » git » 2008 » September » 8

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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jeff King <peff@...>
To: Stephen R. van den Berg <srb@...>
Cc: <git@...>
Subject: Re: [RFC] cherry-pick using multiple parents to implement -x
Date: Sunday, September 7, 2008 - 9:49 pm

On Sun, Sep 07, 2008 at 10:22:02PM +0200, Stephen R. van den Berg wrote:


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?

And yes, of course the _content_ of the trees in E' will be different in
those two cases. But the shape of the history graph will be the same,
and that is the only thing that goes into finding a merge base.

-Peff
--
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.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Sun Sep 7, 6:34 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Junio C Hamano, (Sun Sep 7, 7:53 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Mon Sep 8, 7:51 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Shawn O. Pearce, (Mon Sep 8, 10:38 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Paolo Bonzini, (Mon Sep 8, 11:04 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Mon Sep 8, 10:58 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Shawn O. Pearce, (Mon Sep 8, 11:00 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Tue Sep 9, 4:51 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Paolo Bonzini, (Mon Sep 8, 9:04 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Mon Sep 8, 9:42 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Jakub Narebski, (Mon Sep 8, 10:37 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Paolo Bonzini, (Mon Sep 8, 10:57 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Junio C Hamano, (Sun Sep 7, 1:28 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Paolo Bonzini, (Mon Sep 8, 3:37 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Junio C Hamano, (Mon Sep 8, 3:55 am)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Sun Sep 7, 4:10 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Junio C Hamano, (Sun Sep 7, 6:00 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Thomas Rast, (Sun Sep 7, 5:16 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Junio C Hamano, (Sun Sep 7, 6:22 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Jeff King, (Sun Sep 7, 1:28 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Sun Sep 7, 3:56 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Jeff King, (Sun Sep 7, 4:04 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Sun Sep 7, 4:22 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Jeff King, (Sun Sep 7, 9:49 pm)
Re: [RFC] cherry-pick using multiple parents to implement -x, Stephen R. van den Berg, (Mon Sep 8, 2:57 am)