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

Re: [RFH] Add some very basic tests for git mergetool

From
Alex Riesen <raa.lkml@gmail.com>
Date
Feb 17, 2008, 12:57 UTC
Message-ID
<20080217125714.GA3925@steel.home>
In-Reply-To
<20080217103545.GA24158@hashpling.org>
Charles Bailey, Sun, Feb 17, 2008 11:35:45 +0100:
> I tried to add some basic tests for git mergetool but unfortunately I
> hit a major stumbling block. I seem to have to include a delay in my
> fake mergetool otherwise the cat command didn't seem to work. It was
> as though the source file hadn't been writted out yet.

I removed your delay and the test works every time. Could you strace the test (with "-ff -e open")?

> I'm not sure if there's a shell usleep instead of having to "sleep 1",
Just FYI: coreutils' sleep allows for subsecond sleeps.
Previous: Charles BaileyNext: Charles Bailey
Message 2 of 3 in “[RFH] Add some very basic tests for git mergetool”
  1. Charles BaileyFeb 17, 2008
  2. Alex RiesenFeb 17, 2008
  3. Charles BaileyFeb 17, 2008

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.