git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: whither merge-tree?

From
Dennis Kaarsemaker <dennis@kaarsemaker.net>
Date
Feb 24, 2016, 07:28 UTC
Message-ID
<1456298939.5430.1.camel@kaarsemaker.net>
In-Reply-To
<56CC2B2E.6070203@uni-graz.at>
On di, 2016-02-23 at 10:49 +0100, Stefan Frühwirth wrote:
Show 23 quoted lines
> 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 :)

I am also actively using it. It's the only way (I know of) of trying to preview a merge result without attempting the actual merge, which is useful in some of my scripts.

-- 
Dennis Kaarsemaker
www.kaarsemaker.net
Previous: Stefan FrühwirthNext: Jeff King
Message 15 of 19 in “What's cooking in git.git (Feb 2016, #05; Wed, 17)”
  1. Junio C HamanoFeb 17, 2016
  2. Jeff KingFeb 17, 2016
  3. Junio C HamanoFeb 18, 2016
  4. whither merge-tree? (was: What's cooking in git.git (Feb 2016, #05; Wed, 17))Jeff King, Feb 22, 2016
  5. Junio C HamanoFeb 22, 2016
  6. Jeff KingFeb 23, 2016
  7. Jeff KingFeb 23, 2016
  8. Jeff KingFeb 23, 2016
  9. 1/3 merge-one-file: use empty blob for add/add baseJeff King, Feb 23, 2016
  10. 2/3 merge-tree: drop generate_common strategyJeff King, Feb 23, 2016
  11. 3/3 xdiff: drop XDL_EMIT_COMMONJeff King, Feb 23, 2016
  12. Junio C HamanoFeb 23, 2016
  13. Jeff KingFeb 23, 2016
  14. Stefan FrühwirthFeb 23, 2016
  15. Dennis KaarsemakerFeb 24, 2016
  16. Jeff KingFeb 24, 2016
  17. Jeff KingFeb 24, 2016
  18. Johannes SchindelinFeb 23, 2016
  19. Duy NguyenFeb 23, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.