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

Re: The criss-cross merge case

From
THTupshin Harper <tupshin@tupshin.com>
Date
Apr 28, 2005, 00:43 UTC
Message-ID
<42703194.80409@tupshin.com>
In-Reply-To
<Pine.LNX.4.21.0504271854240.30848-100000@iabervon.org>
Daniel Barkalow wrote:
Show 9 quoted lines
>I've been looking at Darcs (which seems to have a good method, although I
>think the underlying diff isn't great), and Codeville still doesn't have
>any documentation. Arch's method is strictly weaker than 3-way merge, and
>generates more rejects (not even conflicts) in my experience than even
>CVS. 
>
>	-Daniel
>  
>

Can you clarify what you mean by darcs' underlying diff not being that great? It seems to function pretty much identically to gnu diff. In what way would you want the underlying diff to be improved?

-Tupshin
Previous: Daniel BarkalowNext: Daniel Barkalow
Message 3 of 9 in “The criss-cross merge case”
  1. Bram CohenApr 27, 2005
  2. Daniel BarkalowApr 27, 2005
  3. Tupshin HarperApr 28, 2005
  4. Daniel BarkalowApr 28, 2005
  5. Benedikt SchmidtApr 28, 2005
  6. Daniel BarkalowApr 28, 2005
  7. David RoundyApr 28, 2005
  8. suffix array/tree deltas (Was: The criss-cross merge case)Zed A. Shaw, Apr 28, 2005
  9. Daniel BarkalowApr 28, 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.