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

Re: merge-recur status

From
Junio C Hamano <junkio@cox.net>
Date
Aug 9, 2006, 21:18 UTC
Message-ID
<7vy7tx1uc1.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.63.0608092232000.13885@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> I tried to wrap my head over it, but seem unable to do so. Also, I do not 
> find the case 14ALT (which is mentioned in unpack-trees.c:603) in 
> Documentation/technical/trivial-merge.txt.

That is t/t1000-read-tree-m-3way.sh case 14. The current semantics for case 14 used to be called ALT until 3e03aaf simplified the table to reflect the reality, because the "alternative" semantics had been in use for quite some time already back then.

I'd like to take a look at 41094b8e, the real trouble that is causing you grief, sometime later, but I'm currently pondering if the one I tag should be called 1.4.2 or 1.4.2-rc4 ;-).

Previous: Johannes SchindelinNext: Fredrik Kuivinen
Message 2 of 5 in “merge-recur status”
  1. Johannes SchindelinAug 9, 2006
  2. Junio C HamanoAug 9, 2006
  3. Fredrik KuivinenAug 10, 2006
  4. Johannes SchindelinAug 10, 2006
  5. Junio C HamanoAug 10, 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.