Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
checkout: tone down the "forked status" diagnostic messages
[gitweb.git]
/
t
/
t9106-git-svn-dcommit-clobber-series.sh
diff --git
a/t/t9106-git-svn-dcommit-clobber-series.sh
b/t/t9106-git-svn-dcommit-clobber-series.sh
index d59acc8d1ade041d01d5a45aa993b26919a0170c..745254665dd2d8f73b8c511b39aca82682bf1bbb 100755
(executable)
--- 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' &&