diff options
| author |  Eric Wong <normalperson@yhbt.net> | 2007-11-21 00:57:33 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-11-21 20:11:11 -0800 |
| commit | 8d92f24852420c425f3ee499d3c3be01be4dc15c (patch) | |
| tree | e5ad3ac5e99b1c22c11cd901930b2284b7b57a22 | |
| parent | Merge git://repo.or.cz/git-gui (diff) | |
| download | tgif-8d92f24852420c425f3ee499d3c3be01be4dc15c.tar.xz | |
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@yhbt.net>
| -rwxr-xr-x | 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 d59acc8d1a..745254665d 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' && |