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

Re: [PATCH 3/2] Remove emu23, fix entry order

From
Junio C Hamano <junkio@cox.net>
Date
Sep 2, 2005, 06:36 UTC
Message-ID
<7vll2gkmcc.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.63.0509020202030.23242@iabervon.org>
Daniel Barkalow <barkalow@iabervon.org> writes:
Show 6 quoted lines
> A few things to improve testing. I'll clean up the series as a whole once 
> it's tested.
>
> This removes the emu23 tests; I think that the only DF conflict tests were 
> in that set, however, so these should be fished out and added to something 
> else.

Thanks. I'll take a look at 'test moving' part later, perhaps this weekend.

I should give Pasky a heads-up, since I vaguely recall him writing something about always doing 3-way merge even when fast forwarding in his TODO list in the Cogito tree, and just in case emu23 was what he had in mind... I'll also CC: Catalin too just in case StGIT is tempted to use emu23 in git.switch().

Petr, we _might_ remove "read-tree --emu23" in the near future, but not immediately. That will not happen until the read-tree rewrite Daniel is working on proves to be useful in making 'interesting' merges more reliably work.

Previous: Daniel Barkalow
Message 2 of 2 in “Remove emu23, fix entry order”
  1. 3/2 Remove emu23, fix entry orderDaniel Barkalow, Sep 2, 2005
  2. Junio C HamanoSep 2, 2005

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.