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

Re: "tla missing -s" equivalent with git/cogito

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Jan 18, 2006, 18:06 UTC
Message-ID
<46a038f90601181006u40a1f8e1n47c27651a4cab3d@mail.gmail.com>
In-Reply-To
<7vlkxdwhs6.fsf@assigned-by-dhcp.cox.net>
On 1/19/06, Junio C Hamano <junkio@cox.net> wrote:
> Arch star-merge is not an octopus.  They have different "merge
> strategy" just like we have more than one.  No, I do not
> remember the details of how they do it.

In Arch, star-merge is roughly equivalent to git-merge. When I was an Arch user, I could go out and take a walk under the stars while it tried to work its magic on my 10K file tree -- so the name was quite fitting ;-)

The main difference with git is that it has explicit rename tracking and explicit "patches already applied" tracking. We detect those things at merge time, and in my projects it has so far worked better than tla's explicit tracking of things -- but only when I merge with git-merge. One of these days I'll convince Pasky to use git-merge for cg-merge's internals.

cheers,
martin
Previous: Junio C HamanoNext: Petr Baudis
Message 4 of 10 in “"tla missing -s" equivalent with git/cogito”
  1. Belmar-LetelierJan 18, 2006
  2. Andreas EricssonJan 18, 2006
  3. Junio C HamanoJan 18, 2006
  4. Martin LanghoffJan 18, 2006
  5. Petr BaudisJan 18, 2006
  6. Martin LanghoffJan 18, 2006
  7. Martin LanghoffJan 18, 2006
  8. Petr BaudisJan 18, 2006
  9. Martin LanghoffJan 18, 2006
  10. Petr BaudisJan 18, 2006

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.