git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Alex Riesen <raa.lkml@gmail.com>
To: Charles Bailey <charles@hashpling.org>
Cc: git@vger.kernel.org
Subject: Re: [RFH] Add some very basic tests for git mergetool
Date: Sun, 17 Feb 2008 13:57:14 +0100	[thread overview]
Message-ID: <20080217125714.GA3925@steel.home> (raw)
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.

  reply	other threads:[~2008-02-17 12:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-17 10:35 [RFH] Add some very basic tests for git mergetool Charles Bailey
2008-02-17 12:57 ` Alex Riesen [this message]
2008-02-17 13:10   ` Charles Bailey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080217125714.GA3925@steel.home \
    --to=raa.lkml@gmail.com \
    --cc=charles@hashpling.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).