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>

diff --git a/t/t9160-git-svn-mergeinfo-push.sh b/t/t9160-git-svn-mergeinfo-push.sh
deleted file mode 100755 (executable)
index 216f3d7..0000000
--- a/t/t9160-git-svn-mergeinfo-push.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-# Portions copyright (c) 2007, 2009 Sam Vilain
-# Portions copyright (c) 2011 Bryan Jacobs
-#
-
-test_description='git-svn svn mergeinfo propagation'
-
-. ./lib-git-svn.sh
-
-test_expect_success 'load svn dump' "
-       svnadmin load -q '$rawsvnrepo' \
-         < '$TEST_DIRECTORY/t9160/branches.dump' &&
-       git svn init --minimize-url -R svnmerge \
-         -T trunk -b branches '$svnrepo' &&
-       git svn fetch --all
-       "
-
-test_expect_success 'propagate merge information' '
-       git config svn.pushmergeinfo yes &&
-       git checkout svnb1 &&
-       git merge --no-ff svnb2 &&
-       git svn dcommit
-       '
-
-test_expect_success 'check svn:mergeinfo' '
-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
-       test "$mergeinfo" = "/branches/svnb2:3,8"
-       '
-
-test_expect_success 'merge another branch' '
-       git merge --no-ff svnb3 &&
-       git svn dcommit
-       '
-
-test_expect_success 'check primary parent mergeinfo respected' '
-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
-       test "$mergeinfo" = "/branches/svnb2:3,8
-/branches/svnb3:4,9"
-       '
-
-test_expect_success 'merge existing merge' '
-       git merge --no-ff svnb4 &&
-       git svn dcommit
-       '
-
-test_expect_success "check both parents' mergeinfo respected" '
-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
-       test "$mergeinfo" = "/branches/svnb2:3,8
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-       '
-
-test_expect_success 'make further commits to branch' '
-       git checkout svnb2 &&
-       touch newb2file &&
-       git add newb2file &&
-       git commit -m "later b2 commit" &&
-       touch newb2file-2 &&
-       git add newb2file-2 &&
-       git commit -m "later b2 commit 2" &&
-       git svn dcommit
-       '
-
-test_expect_success 'second forward merge' '
-       git checkout svnb1 &&
-       git merge --no-ff svnb2 &&
-       git svn dcommit
-       '
-
-test_expect_success 'check new mergeinfo added' '
-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
-       test "$mergeinfo" = "/branches/svnb2:3,8,16-17
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-       '
-
-test_expect_success 'reintegration merge' '
-       git checkout svnb4 &&
-       git merge --no-ff svnb1 &&
-       git svn dcommit
-       '
-
-test_expect_success 'check reintegration mergeinfo' '
-       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
-       test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
-/branches/svnb2:3,8,16-17
-/branches/svnb3:4,9
-/branches/svnb4:5-6,10-12
-/branches/svnb5:6,11"
-       '
-
-test_expect_success 'dcommit a merge at the top of a stack' '
-       git checkout svnb1 &&
-       touch anotherfile &&
-       git add anotherfile &&
-       git commit -m "a commit" &&
-       git merge svnb4 &&
-       git svn dcommit
-       '
-
-test_done

diff --git a/t/t9160/branches.dump b/t/t9160/branches.dump
deleted file mode 100644 (file)
index e61c3e7..0000000
--- a/t/t9160/branches.dump
+++ /dev/null
@@ -1,374 +0,0 @@
-SVN-fs-dump-format-version: 2
-
-UUID: 1ef08553-f2d1-45df-b38c-19af6b7c926d
-
-Revision-number: 0
-Prop-content-length: 56
-Content-length: 56
-
-K 8
-svn:date
-V 27
-2011-09-02T16:08:02.941384Z
-PROPS-END
-
-Revision-number: 1
-Prop-content-length: 114
-Content-length: 114
-
-K 7
-svn:log
-V 12
-Base commit
-
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:08:27.205062Z
-PROPS-END
-
-Node-path: branches
-Node-kind: dir
-Node-action: add
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
-Node-path: trunk
-Node-kind: dir
-Node-action: add
-Prop-content-length: 10
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 2
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 19
-Create branch svnb1
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:09:43.628137Z
-PROPS-END
-
-Node-path: branches/svnb1
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Revision-number: 3
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 19
-Create branch svnb2
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:09:46.339930Z
-PROPS-END
-
-Node-path: branches/svnb2
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Revision-number: 4
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 19
-Create branch svnb3
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:09:49.394515Z
-PROPS-END
-
-Node-path: branches/svnb3
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Revision-number: 5
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 19
-Create branch svnb4
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:09:54.114607Z
-PROPS-END
-
-Node-path: branches/svnb4
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Revision-number: 6
-Prop-content-length: 121
-Content-length: 121
-
-K 7
-svn:log
-V 19
-Create branch svnb5
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:09:58.602623Z
-PROPS-END
-
-Node-path: branches/svnb5
-Node-kind: dir
-Node-action: add
-Node-copyfrom-rev: 1
-Node-copyfrom-path: trunk
-
-
-Revision-number: 7
-Prop-content-length: 110
-Content-length: 110
-
-K 7
-svn:log
-V 9
-b1 commit
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:10:20.292369Z
-PROPS-END
-
-Node-path: branches/svnb1/b1file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 8
-Prop-content-length: 110
-Content-length: 110
-
-K 7
-svn:log
-V 9
-b2 commit
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:10:38.429199Z
-PROPS-END
-
-Node-path: branches/svnb2/b2file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 9
-Prop-content-length: 110
-Content-length: 110
-
-K 7
-svn:log
-V 9
-b3 commit
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:10:52.843023Z
-PROPS-END
-
-Node-path: branches/svnb3/b3file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 10
-Prop-content-length: 110
-Content-length: 110
-
-K 7
-svn:log
-V 9
-b4 commit
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:11:17.489870Z
-PROPS-END
-
-Node-path: branches/svnb4/b4file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 11
-Prop-content-length: 110
-Content-length: 110
-
-K 7
-svn:log
-V 9
-b5 commit
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:11:32.277404Z
-PROPS-END
-
-Node-path: branches/svnb5/b5file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
-Content-length: 10
-
-PROPS-END
-
-
-Revision-number: 12
-Prop-content-length: 192
-Content-length: 192
-
-K 7
-svn:log
-V 90
-Merge remote-tracking branch 'svnb5' into HEAD
-
-* svnb5:
-  b5 commit
-  Create branch svnb5
-K 10
-svn:author
-V 7
-bjacobs
-K 8
-svn:date
-V 27
-2011-09-02T16:11:54.274722Z
-PROPS-END
-
-Node-path: branches/svnb4
-Node-kind: dir
-Node-action: change
-Prop-content-length: 56
-Content-length: 56
-
-K 13
-svn:mergeinfo
-V 21
-/branches/svnb5:6,11
-
-PROPS-END
-
-
-Node-path: branches/svnb4/b5file
-Node-kind: file
-Node-action: add
-Prop-content-length: 10
-Text-content-length: 0
-Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
-Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
-Content-length: 10
-
-PROPS-END
-
-

diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh
new file mode 100755 (executable)
index 0000000..6ef0c0b
--- /dev/null
+++ b/t/t9161-git-svn-mergeinfo-push.sh
@@ -0,0 +1,104 @@
+#!/bin/sh
+#
+# Portions copyright (c) 2007, 2009 Sam Vilain
+# Portions copyright (c) 2011 Bryan Jacobs
+#
+
+test_description='git-svn svn mergeinfo propagation'
+
+. ./lib-git-svn.sh
+
+test_expect_success 'load svn dump' "
+       svnadmin load -q '$rawsvnrepo' \
+         < '$TEST_DIRECTORY/t9161/branches.dump' &&
+       git svn init --minimize-url -R svnmerge \
+         -T trunk -b branches '$svnrepo' &&
+       git svn fetch --all
+       "
+
+test_expect_success 'propagate merge information' '
+       git config svn.pushmergeinfo yes &&
+       git checkout svnb1 &&
+       git merge --no-ff svnb2 &&
+       git svn dcommit
+       '
+
+test_expect_success 'check svn:mergeinfo' '
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       test "$mergeinfo" = "/branches/svnb2:3,8"
+       '
+
+test_expect_success 'merge another branch' '
+       git merge --no-ff svnb3 &&
+       git svn dcommit
+       '
+
+test_expect_success 'check primary parent mergeinfo respected' '
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       test "$mergeinfo" = "/branches/svnb2:3,8
+/branches/svnb3:4,9"
+       '
+
+test_expect_success 'merge existing merge' '
+       git merge --no-ff svnb4 &&
+       git svn dcommit
+       '
+
+test_expect_success "check both parents' mergeinfo respected" '
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       test "$mergeinfo" = "/branches/svnb2:3,8
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+       '
+
+test_expect_success 'make further commits to branch' '
+       git checkout svnb2 &&
+       touch newb2file &&
+       git add newb2file &&
+       git commit -m "later b2 commit" &&
+       touch newb2file-2 &&
+       git add newb2file-2 &&
+       git commit -m "later b2 commit 2" &&
+       git svn dcommit
+       '
+
+test_expect_success 'second forward merge' '
+       git checkout svnb1 &&
+       git merge --no-ff svnb2 &&
+       git svn dcommit
+       '
+
+test_expect_success 'check new mergeinfo added' '
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb1)
+       test "$mergeinfo" = "/branches/svnb2:3,8,16-17
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+       '
+
+test_expect_success 'reintegration merge' '
+       git checkout svnb4 &&
+       git merge --no-ff svnb1 &&
+       git svn dcommit
+       '
+
+test_expect_success 'check reintegration mergeinfo' '
+       mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/branches/svnb4)
+       test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18
+/branches/svnb2:3,8,16-17
+/branches/svnb3:4,9
+/branches/svnb4:5-6,10-12
+/branches/svnb5:6,11"
+       '
+
+test_expect_success 'dcommit a merge at the top of a stack' '
+       git checkout svnb1 &&
+       touch anotherfile &&
+       git add anotherfile &&
+       git commit -m "a commit" &&
+       git merge svnb4 &&
+       git svn dcommit
+       '
+
+test_done

diff --git a/t/t9161/branches.dump b/t/t9161/branches.dump
new file mode 100644 (file)
index 0000000..e61c3e7
--- /dev/null
+++ b/t/t9161/branches.dump
@@ -0,0 +1,374 @@
+SVN-fs-dump-format-version: 2
+
+UUID: 1ef08553-f2d1-45df-b38c-19af6b7c926d
+
+Revision-number: 0
+Prop-content-length: 56
+Content-length: 56
+
+K 8
+svn:date
+V 27
+2011-09-02T16:08:02.941384Z
+PROPS-END
+
+Revision-number: 1
+Prop-content-length: 114
+Content-length: 114
+
+K 7
+svn:log
+V 12
+Base commit
+
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:08:27.205062Z
+PROPS-END
+
+Node-path: branches
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Node-path: trunk
+Node-kind: dir
+Node-action: add
+Prop-content-length: 10
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 2
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 19
+Create branch svnb1
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:09:43.628137Z
+PROPS-END
+
+Node-path: branches/svnb1
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Revision-number: 3
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 19
+Create branch svnb2
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:09:46.339930Z
+PROPS-END
+
+Node-path: branches/svnb2
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Revision-number: 4
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 19
+Create branch svnb3
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:09:49.394515Z
+PROPS-END
+
+Node-path: branches/svnb3
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Revision-number: 5
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 19
+Create branch svnb4
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:09:54.114607Z
+PROPS-END
+
+Node-path: branches/svnb4
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Revision-number: 6
+Prop-content-length: 121
+Content-length: 121
+
+K 7
+svn:log
+V 19
+Create branch svnb5
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:09:58.602623Z
+PROPS-END
+
+Node-path: branches/svnb5
+Node-kind: dir
+Node-action: add
+Node-copyfrom-rev: 1
+Node-copyfrom-path: trunk
+
+
+Revision-number: 7
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 9
+b1 commit
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:10:20.292369Z
+PROPS-END
+
+Node-path: branches/svnb1/b1file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 8
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 9
+b2 commit
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:10:38.429199Z
+PROPS-END
+
+Node-path: branches/svnb2/b2file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 9
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 9
+b3 commit
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:10:52.843023Z
+PROPS-END
+
+Node-path: branches/svnb3/b3file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 10
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 9
+b4 commit
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:11:17.489870Z
+PROPS-END
+
+Node-path: branches/svnb4/b4file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 11
+Prop-content-length: 110
+Content-length: 110
+
+K 7
+svn:log
+V 9
+b5 commit
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:11:32.277404Z
+PROPS-END
+
+Node-path: branches/svnb5/b5file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 10
+
+PROPS-END
+
+
+Revision-number: 12
+Prop-content-length: 192
+Content-length: 192
+
+K 7
+svn:log
+V 90
+Merge remote-tracking branch 'svnb5' into HEAD
+
+* svnb5:
+  b5 commit
+  Create branch svnb5
+K 10
+svn:author
+V 7
+bjacobs
+K 8
+svn:date
+V 27
+2011-09-02T16:11:54.274722Z
+PROPS-END
+
+Node-path: branches/svnb4
+Node-kind: dir
+Node-action: change
+Prop-content-length: 56
+Content-length: 56
+
+K 13
+svn:mergeinfo
+V 21
+/branches/svnb5:6,11
+
+PROPS-END
+
+
+Node-path: branches/svnb4/b5file
+Node-kind: file
+Node-action: add
+Prop-content-length: 10
+Text-content-length: 0
+Text-content-md5: d41d8cd98f00b204e9800998ecf8427e
+Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709
+Content-length: 10
+
+PROPS-END
+
+