From: Frederic Heitzmann Date: Fri, 16 Sep 2011 21:16:54 GMT Subject: Re: [PATCH] Disambiguate duplicate t9160* tests Message-ID: <4E73BCC6.2030303@gmail.com> In-Reply-To: <7viposdwos.fsf@alter.siamese.dyndns.org> Le 16/09/2011 23:06, Junio C Hamano a écrit : > Junio C Hamano writes: > >> Thanks. > > Heh, I spoke too early. It still refers to contents of t/t9160/ directory. > We would need this squashed into your patch (no need to resend). > > t/t9161-git-svn-mergeinfo-push.sh | 2 +- > t/{t9160 => t9161}/branches.dump | 0 > 2 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh > index 216f3d7..6ef0c0b 100755 > --- a/t/t9161-git-svn-mergeinfo-push.sh > +++ b/t/t9161-git-svn-mergeinfo-push.sh > @@ -10,7 +10,7 @@ test_description='git-svn svn mergeinfo propagation' > > test_expect_success 'load svn dump' " > svnadmin load -q '$rawsvnrepo' \ > - < '$TEST_DIRECTORY/t9160/branches.dump'&& > + < '$TEST_DIRECTORY/t9161/branches.dump'&& > git svn init --minimize-url -R svnmerge \ > -T trunk -b branches '$svnrepo'&& > git svn fetch --all > diff --git a/t/t9160/branches.dump b/t/t9161/branches.dump > similarity index 100% > rename from t/t9160/branches.dump > rename to t/t9161/branches.dump Ooops ! I checked 'make test', but missed the most obvious change. Sorry for this. -- Fred