* [PATCH] Disambiguate duplicate t9160* tests
@ 2011-09-16 19:55 Frédéric Heitzmann
2011-09-16 20:41 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Frédéric Heitzmann @ 2011-09-16 19:55 UTC (permalink / raw)
To: git; +Cc: gitster, bjacobs, rchen, Frédéric Heitzmann
1e5814f created t9160-git-svn-mergeinfo-push.sh on 11/9/7
40a1530 createds t9160-git-svn-preserve-empty-dirs.sh on 11/7/20
The former test script is renumbered to t9161.
Signed-off-by: Frédéric Heitzmann <frederic.heitzmann@gmail.com>
---
I did not find any explicit objection in t/README but it looks odd.
...nfo-push.sh => t9161-git-svn-mergeinfo-push.sh} | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename t/{t9160-git-svn-mergeinfo-push.sh => t9161-git-svn-mergeinfo-push.sh} (100%)
diff --git a/t/t9160-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh
similarity index 100%
rename from t/t9160-git-svn-mergeinfo-push.sh
rename to t/t9161-git-svn-mergeinfo-push.sh
--
1.7.7.rc0.200.g2f9e2e
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] Disambiguate duplicate t9160* tests
2011-09-16 19:55 [PATCH] Disambiguate duplicate t9160* tests Frédéric Heitzmann
@ 2011-09-16 20:41 ` Junio C Hamano
2011-09-16 21:06 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2011-09-16 20:41 UTC (permalink / raw)
To: Frédéric Heitzmann; +Cc: git, bjacobs, rchen
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Disambiguate duplicate t9160* tests
2011-09-16 20:41 ` Junio C Hamano
@ 2011-09-16 21:06 ` Junio C Hamano
2011-09-16 21:16 ` Frederic Heitzmann
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2011-09-16 21:06 UTC (permalink / raw)
To: Frédéric Heitzmann; +Cc: git, bjacobs, rchen
Junio C Hamano <gitster@pobox.com> 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] Disambiguate duplicate t9160* tests
2011-09-16 21:06 ` Junio C Hamano
@ 2011-09-16 21:16 ` Frederic Heitzmann
0 siblings, 0 replies; 4+ messages in thread
From: Frederic Heitzmann @ 2011-09-16 21:16 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, bjacobs, rchen
Le 16/09/2011 23:06, Junio C Hamano a écrit :
> Junio C Hamano<gitster@pobox.com> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-16 21:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-16 19:55 [PATCH] Disambiguate duplicate t9160* tests Frédéric Heitzmann
2011-09-16 20:41 ` Junio C Hamano
2011-09-16 21:06 ` Junio C Hamano
2011-09-16 21:16 ` Frederic Heitzmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).