]> asedeno.scripts.mit.edu Git - git.git/commitdiff
t9106: fix a race condition that caused svn to miss modifications
authorEric Wong <normalperson@yhbt.net>
Wed, 21 Nov 2007 08:57:33 +0000 (00:57 -0800)
committerEric Wong <normalperson@yhbt.net>
Thu, 22 Nov 2007 04:11:11 +0000 (20:11 -0800)
carbonated beverage noticed this test was occasionally failing.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
t/t9106-git-svn-dcommit-clobber-series.sh

index d59acc8d1ade041d01d5a45aa993b26919a0170c..745254665dd2d8f73b8c511b39aca82682bf1bbb 100755 (executable)
@@ -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' &&