From: "Stefan Frühwirth" <stefan.fruehwirth@uni-graz.at>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>
Subject: Re: whither merge-tree?
Date: Tue, 23 Feb 2016 10:49:34 +0100 [thread overview]
Message-ID: <56CC2B2E.6070203@uni-graz.at> (raw)
In-Reply-To: <20160223050210.GA17767@sigill.intra.peff.net>
On 23.02.2016 at 06:02 Jeff King wrote:
>> Let's wait and see how many "please don't"s we hear, perhaps, before
>> deciding to go 3.?
>
> I'm guessing we won't see much either way. Even Stefan, the original
> reporter, does not seem to actively be using it, but rather relaying a
> report.
I _am_ actively using it. Maybe I was unclear on that topic. I'm in
favour of keeping it, because this means I don't have to rewrite Chris'
Code in order to be able to use the Python library that uses merge-tree
(Acidfs). But as a sensible human being I want what's best in the long
run. I leave that up to you as I have no way of assessing that.
So that's a "please don't" leave the code as-is but provide a
(transitional) solution that fixes the reported bug and has the best
chances of not causing any more headaches :)
> We'd probably get more response by doing 2 for now, then adding a
> deprecation warning to the manpage (and possibly the program itself) for
> the next release.
A deprecation warning would be very welcome.
Thanks,
Stefan
next prev parent reply other threads:[~2016-02-23 9:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 22:34 What's cooking in git.git (Feb 2016, #05; Wed, 17) Junio C Hamano
2016-02-17 23:25 ` Jeff King
2016-02-18 17:51 ` Junio C Hamano
2016-02-22 22:12 ` whither merge-tree? (was: What's cooking in git.git (Feb 2016, #05; Wed, 17)) Jeff King
2016-02-22 22:45 ` whither merge-tree? Junio C Hamano
2016-02-23 5:02 ` Jeff King
2016-02-23 5:14 ` Jeff King
2016-02-23 6:03 ` Jeff King
2016-02-23 6:04 ` [PATCH 1/3] merge-one-file: use empty blob for add/add base Jeff King
2016-02-23 6:06 ` [PATCH 2/3] merge-tree: drop generate_common strategy Jeff King
2016-02-23 6:07 ` [PATCH 3/3] xdiff: drop XDL_EMIT_COMMON Jeff King
2016-02-23 6:35 ` whither merge-tree? Junio C Hamano
2016-02-23 7:18 ` Jeff King
2016-02-23 9:49 ` Stefan Frühwirth [this message]
2016-02-24 7:28 ` Dennis Kaarsemaker
2016-02-24 7:57 ` Jeff King
2016-02-24 7:58 ` Jeff King
2016-02-23 12:36 ` Johannes Schindelin
2016-02-23 12:41 ` Duy Nguyen
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=56CC2B2E.6070203@uni-graz.at \
--to=stefan.fruehwirth@uni-graz.at \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).