From: Steven Walter Date: Wed, 22 Feb 2012 02:32:29 GMT Subject: Re: [PATCH] git-svn.perl: fix a false-positive in the "already exists" test Message-ID: In-Reply-To: <7vk43feho8.fsf@alter.siamese.dyndns.org> On Tue, Feb 21, 2012 at 9:16 PM, Junio C Hamano wrote: > Steven Walter writes: > >> diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh >> index b041516..4029f84 100755 >> --- a/t/t9100-git-svn-basic.sh >> +++ b/t/t9100-git-svn-basic.sh >> @@ -92,9 +92,11 @@ test_expect_success "$name" ' >>       echo yyy > bar/zzz/yyy && >>       git update-index --add bar/zzz/yyy && >>       git commit -m "$name" && >> +     git svn set-tree --find-copies-harder --rmdir \ >> +             ${remotes_git_svn}..mybranch3 && >> +     svn_cmd up "$SVN_TREE" && >> +     test -d "$SVN_TREE"/bar/zzz && >> +     test -e "$SVN_TREE"/bar/zzz/yyy ' || true > > Care to explain what this " || true" is doing here, please? Ahh, good catch. I think the answer is that it shouldn't be there. It was originally there because of the "test_must_fail" line, I think (at least the other tests that use test_must_fail also have "|| true"). The tests all still pass with that "|| true" removed. Do you want to just fix that up, or a new version of the original patch, or a fix on top of the original patches? -- -Steven Walter