From: "Stephen R. van den Berg" <srb@cuci.nl>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [RFC] cherry-pick using multiple parents to implement -x
Date: Mon, 8 Sep 2008 08:57:23 +0200 [thread overview]
Message-ID: <20080908065723.GA29969@cuci.nl> (raw)
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."
next prev parent reply other threads:[~2008-09-08 6:58 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-07 10:34 [RFC] cherry-pick using multiple parents to implement -x Stephen R. van den Berg
2008-09-07 17:28 ` Jeff King
2008-09-07 19:56 ` Stephen R. van den Berg
2008-09-07 20:04 ` Jeff King
2008-09-07 20:22 ` Stephen R. van den Berg
2008-09-08 1:49 ` Jeff King
2008-09-08 6:57 ` Stephen R. van den Berg [this message]
2008-09-07 17:28 ` Junio C Hamano
2008-09-07 20:10 ` Stephen R. van den Berg
2008-09-07 21:16 ` Thomas Rast
2008-09-07 22:22 ` Junio C Hamano
2008-09-07 22:00 ` Junio C Hamano
2008-09-08 7:37 ` Paolo Bonzini
2008-09-08 7:55 ` Junio C Hamano
2008-09-07 23:53 ` Junio C Hamano
2008-09-08 11:51 ` Stephen R. van den Berg
2008-09-08 13:04 ` Paolo Bonzini
2008-09-08 13:42 ` Stephen R. van den Berg
2008-09-08 14:37 ` Jakub Narebski
2008-09-08 14:57 ` Paolo Bonzini
2008-09-08 14:38 ` Shawn O. Pearce
2008-09-08 14:58 ` Stephen R. van den Berg
2008-09-08 15:00 ` Shawn O. Pearce
2008-09-09 8:51 ` Stephen R. van den Berg
2008-09-08 15:04 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080908065723.GA29969@cuci.nl \
--to=srb@cuci.nl \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.