Hi, thanks for the heads up, Christian carbonated beverage <ramune@xxxxxxxxxxxxx> wrote: > > Ok thanks for doing that too. > > Could you also look at the "file" when the test succeed and when it does not > > and send us both versions and a diff between them (if it's not too big). > > Size-wise, they're tiny -- though there's a lot of lines. > > The diff: > > ramune/lycaeum:t: diff -u works.t fails.t > --- works.t 2007-11-20 21:54:29.000000000 -0700 > +++ fails.t 2007-11-20 21:54:39.000000000 -0700 > @@ -55,9 +55,9 @@ > 55 > 56 > 57 > -5588 > +58 > 59 > 60 > -6611 > +61 > 62 > 63 Ah, these changes should've been made on the svn side. But I'm betting a race condition appears on faster computers (which we've seen before in other tests). I can't reproduce it at all on any of my boxes, but does the following one-liner fix it consistently? Thanks, From: Eric Wong <normalperson@xxxxxxxx> Date: Wed, 21 Nov 2007 00:57:33 -0800 Subject: [PATCH] t9106: fix a race condition that caused svn to miss modifications carbonated beverage noticed this test was occasionally failing. Signed-off-by: Eric Wong <normalperson@xxxxxxxx> --- t/t9106-git-svn-dcommit-clobber-series.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/t/t9106-git-svn-dcommit-clobber-series.sh b/t/t9106-git-svn-dcommit-clobber-series.sh index d59acc8..7452546 100755 --- a/t/t9106-git-svn-dcommit-clobber-series.sh +++ b/t/t9106-git-svn-dcommit-clobber-series.sh @@ -22,6 +22,7 @@ test_expect_success '(supposedly) non-conflicting change from SVN' " cd tmp && perl -i -p -e 's/^58\$/5588/' file && perl -i -p -e 's/^61\$/6611/' file && + poke file && test x\"\`sed -n -e 58p < file\`\" = x5588 && test x\"\`sed -n -e 61p < file\`\" = x6611 && svn commit -m '58 => 5588, 61 => 6611' && -- Eric Wong - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
