summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Heitzmann <frederic.heitzmann@gmail.com>2011-09-16 21:55:03 +0200
committerJunio C Hamano <gitster@pobox.com>2011-09-16 14:06:19 -0700
commit26e4266f2fee3454370885ff480b38d045ca1731 (patch)
tree5f1d456fe22b8d98e4f89762cdb409648de26814
parent559357b508847df5a5736ed7130f6bccab52d044 (diff)
downloadgit-26e4266f2fee3454370885ff480b38d045ca1731.tar.gz
Disambiguate duplicate t9160* tests
1e5814f created t9160-git-svn-mergeinfo-push.sh on 11/9/7 40a1530 created 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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t9161-git-svn-mergeinfo-push.sh (renamed from t/t9160-git-svn-mergeinfo-push.sh)2
-rw-r--r--t/t9161/branches.dump (renamed from t/t9160/branches.dump)0
2 files changed, 1 insertions, 1 deletions
diff --git a/t/t9160-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh
index 216f3d773c..6ef0c0bde3 100755
--- a/t/t9160-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
index e61c3e7236..e61c3e7236 100644
--- a/t/t9160/branches.dump
+++ b/t/t9161/branches.dump