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

Re: warning merge message

From
Shawn Pearce <spearce@spearce.org>
Date
Dec 22, 2006, 00:43 UTC
Message-ID
<20061222004311.GC14636@spearce.org>
In-Reply-To
<121430.93915.qm@web31808.mail.mud.yahoo.com>
Luben Tuikov <ltuikov@yahoo.com> wrote:
> I'm swamped.  Did you say you have no 64 bit machines you can try it on?
> Also, I don't mind giving you my dev tree, but currently I don't export
> it anywhere.  BTW, I've seen this bug on 64 bit machines.  I've not tried
> it on 32.

I have an amd64 here that I need to finish configuring. Its running well enough however that I could debug this issue on that machine if I could get the branches in question.

merge-recursive and the xdl_merge() routine aren't exactly my area of expertise, but if Johannes can't do it I'll step up and see what I can do.

-- 
Shawn.
Previous: Luben TuikovNext: Junio C Hamano
Message 4 of 11 in “warning merge message”
  1. Luben TuikovDec 20, 2006
  2. Johannes SchindelinDec 21, 2006
  3. Luben TuikovDec 22, 2006
  4. Shawn PearceDec 22, 2006
  5. Junio C HamanoDec 22, 2006
  6. Junio C HamanoDec 22, 2006
  7. Josef WeidendorferDec 22, 2006
  8. Junio C HamanoDec 22, 2006
  9. Josef WeidendorferDec 22, 2006
  10. Junio C HamanoDec 22, 2006
  11. Josef WeidendorferDec 23, 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.