]>
Commit | Line | Data |
---|---|---|
a00439ac EW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2006 Eric Wong | |
4 | # | |
5 | ||
6 | test_description='git-svn --follow-parent fetching' | |
7 | . ./lib-git-svn.sh | |
8 | ||
a00439ac EW |
9 | test_expect_success 'initialize repo' " |
10 | mkdir import && | |
11 | cd import && | |
12 | mkdir -p trunk && | |
13 | echo hello > trunk/readme && | |
14 | svn import -m 'initial' . $svnrepo && | |
15 | cd .. && | |
16 | svn co $svnrepo wc && | |
17 | cd wc && | |
18 | echo world >> trunk/readme && | |
7b3fab87 | 19 | poke trunk/readme && |
a00439ac | 20 | svn commit -m 'another commit' && |
e66191f4 | 21 | svn up && |
a00439ac EW |
22 | svn mv -m 'rename to thunk' trunk thunk && |
23 | svn up && | |
24 | echo goodbye >> thunk/readme && | |
7b3fab87 | 25 | poke thunk/readme && |
a00439ac EW |
26 | svn commit -m 'bye now' && |
27 | cd .. | |
28 | " | |
29 | ||
30 | test_expect_success 'init and fetch --follow-parent a moved directory' " | |
31 | git-svn init -i thunk $svnrepo/thunk && | |
32 | git-svn fetch --follow-parent -i thunk && | |
15710b6f EW |
33 | test \"\`git-rev-parse --verify refs/remotes/trunk\`\" \ |
34 | = \"\`git-rev-parse --verify refs/remotes/thunk~1\`\" && | |
35 | test \"\`git-cat-file blob refs/remotes/thunk:readme |\ | |
36 | sed -n -e '3p'\`\" = goodbye | |
a00439ac EW |
37 | " |
38 | ||
8b8fc068 EW |
39 | test_expect_success 'init and fetch from one svn-remote' " |
40 | git-repo-config svn-remote.git-svn.url $svnrepo && | |
41 | git-repo-config --add svn-remote.git-svn.fetch \ | |
42 | trunk:refs/remotes/svn/trunk && | |
43 | git-repo-config --add svn-remote.git-svn.fetch \ | |
44 | thunk:refs/remotes/svn/thunk && | |
45 | git-svn fetch --follow-parent -i svn/thunk && | |
46 | test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \ | |
47 | = \"\`git-rev-parse --verify refs/remotes/svn/thunk~1\`\" && | |
48 | test \"\`git-cat-file blob refs/remotes/svn/thunk:readme |\ | |
49 | sed -n -e '3p'\`\" = goodbye | |
50 | " | |
51 | ||
a2003abc EW |
52 | test_expect_success 'follow deleted parent' " |
53 | svn cp -m 'resurrecting trunk as junk' \ | |
54 | -r2 $svnrepo/trunk $svnrepo/junk && | |
55 | git-repo-config --add svn-remote.git-svn.fetch \ | |
56 | junk:refs/remotes/svn/junk && | |
57 | git-svn fetch --follow-parent -i svn/thunk && | |
58 | git-svn fetch -i svn/junk --follow-parent && | |
59 | test -z \"\`git diff svn/junk svn/trunk\`\" && | |
60 | test \"\`git merge-base svn/junk svn/trunk\`\" \ | |
61 | = \"\`git rev-parse svn/trunk\`\" | |
62 | " | |
63 | ||
7f578c55 EW |
64 | test_expect_success 'follow larger parent' " |
65 | mkdir -p import/trunk/thunk/bump/thud && | |
66 | echo hi > import/trunk/thunk/bump/thud/file && | |
67 | svn import -m 'import a larger parent' import $svnrepo/larger-parent && | |
68 | svn cp -m 'hi' $svnrepo/larger-parent $svnrepo/another-larger && | |
69 | git-svn init -i larger $svnrepo/another-larger/trunk/thunk/bump/thud && | |
70 | git-svn fetch -i larger --follow-parent && | |
71 | git-rev-parse --verify refs/remotes/larger && | |
72 | git-rev-parse --verify \ | |
73 | refs/remotes/larger-parent/trunk/thunk/bump/thud && | |
74 | test \"\`git-merge-base \ | |
75 | refs/remotes/larger-parent/trunk/thunk/bump/thud \ | |
76 | refs/remotes/larger\`\" = \ | |
77 | \"\`git-rev-parse refs/remotes/larger\`\" | |
78 | true | |
79 | " | |
80 | ||
1492b424 EW |
81 | test_expect_success 'follow higher-level parent' " |
82 | svn mkdir -m 'follow higher-level parent' $svnrepo/blob && | |
83 | svn co $svnrepo/blob blob && | |
84 | cd blob && | |
85 | echo hi > hi && | |
86 | svn add hi && | |
e5a0b240 | 87 | svn commit -m 'hihi' && |
1492b424 EW |
88 | cd .. |
89 | svn mkdir -m 'new glob at top level' $svnrepo/glob && | |
90 | svn mv -m 'move blob down a level' $svnrepo/blob $svnrepo/glob/blob && | |
91 | git-svn init -i blob $svnrepo/glob/blob && | |
92 | git-svn fetch -i blob --follow-parent | |
93 | " | |
94 | ||
e5a0b240 EW |
95 | test_expect_success 'follow deleted directory' " |
96 | svn mv -m 'bye!' $svnrepo/glob/blob/hi $svnrepo/glob/blob/bye&& | |
97 | svn rm -m 'remove glob' $svnrepo/glob && | |
98 | git-svn init -i glob $svnrepo/glob && | |
99 | git-svn fetch -i glob && | |
100 | test \"\`git cat-file blob refs/remotes/glob~1:blob/bye\`\" = hi && | |
101 | test -z \"\`git ls-tree -z refs/remotes/glob\`\" | |
102 | " | |
103 | ||
2b27f6c8 EW |
104 | # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn) |
105 | # in trunk/subversion/bindings/swig/perl | |
106 | test_expect_success '' " | |
107 | mkdir -p import/trunk/subversion/bindings/swig/perl/t && | |
108 | for i in a b c ; do \ | |
109 | echo \$i > import/trunk/subversion/bindings/swig/perl/\$i.pm && | |
110 | echo _\$i > import/trunk/subversion/bindings/swig/perl/t/\$i.t; \ | |
111 | done && | |
112 | echo 'bad delete test' > \ | |
113 | import/trunk/subversion/bindings/swig/perl/t/larger-parent && | |
114 | echo 'bad delete test 2' > \ | |
115 | import/trunk/subversion/bindings/swig/perl/another-larger && | |
116 | cd import && | |
117 | svn import -m 'r9270 test' . $svnrepo/r9270 && | |
118 | cd .. && | |
119 | svn co $svnrepo/r9270/trunk/subversion/bindings/swig/perl r9270 && | |
120 | cd r9270 && | |
121 | svn mkdir native && | |
122 | svn mv t native/t && | |
123 | for i in a b c; do svn mv \$i.pm native/\$i.pm; done && | |
124 | echo z >> native/t/c.t && | |
125 | svn commit -m 'reorg test' && | |
126 | cd .. && | |
127 | git-svn init -i r9270-t \ | |
128 | $svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t && | |
129 | git-svn fetch -i r9270-t --follow-parent && | |
130 | test \`git rev-list r9270-t | wc -l\` -eq 2 && | |
131 | test \"\`git ls-tree --name-only r9270-t~1\`\" = \ | |
132 | \"\`git ls-tree --name-only r9270-t\`\" | |
133 | " | |
134 | ||
a00439ac EW |
135 | test_debug 'gitk --all &' |
136 | ||
137 | test_done |