From 26e4266f2fee3454370885ff480b38d045ca1731 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Heitzmann?=
<frederic.heitzmann@gmail.com>
Date: Fri, 16 Sep 2011 21:55:03 +0200
Subject: [PATCH] Disambiguate duplicate t9160* tests
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
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>
---
...it-svn-mergeinfo-push.sh => t9161-git-svn-mergeinfo-push.sh} | 2 +-
t/{t9160 => t9161}/branches.dump | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename t/{t9160-git-svn-mergeinfo-push.sh => t9161-git-svn-mergeinfo-push.sh} (98%)
rename t/{t9160 => t9161}/branches.dump (100%)
diff --git a/t/t9160-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh
similarity index 98%
rename from t/t9160-git-svn-mergeinfo-push.sh
rename to t/t9161-git-svn-mergeinfo-push.sh
index 216f3d773..6ef0c0bde 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
similarity index 100%
rename from t/t9160/branches.dump
rename to t/t9161/branches.dump
--
2.26.2