Add a test for git-add --ignore-errors
[git/trast.git] / t / t9104-git-svn-follow-parent.sh
blob7ba76309ac9e57f9e5379bf93ecac4e6a4e4ad96
1 #!/bin/sh
3 # Copyright (c) 2006 Eric Wong
6 test_description='git-svn fetching'
7 . ./lib-git-svn.sh
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 &&
19 poke trunk/readme &&
20 svn commit -m 'another commit' &&
21 svn up &&
22 svn mv trunk thunk &&
23 echo goodbye >> thunk/readme &&
24 poke thunk/readme &&
25 svn commit -m 'bye now' &&
26 cd ..
29 test_expect_success 'init and fetch a moved directory' "
30 git-svn init --minimize-url -i thunk $svnrepo/thunk &&
31 git-svn fetch -i thunk &&
32 test \"\`git rev-parse --verify refs/remotes/thunk@2\`\" \
33 = \"\`git rev-parse --verify refs/remotes/thunk~1\`\" &&
34 test \"\`git cat-file blob refs/remotes/thunk:readme |\
35 sed -n -e '3p'\`\" = goodbye &&
36 test -z \"\`git config --get svn-remote.svn.fetch \
37 '^trunk:refs/remotes/thunk@2$'\`\"
40 test_expect_success 'init and fetch from one svn-remote' "
41 git config svn-remote.svn.url $svnrepo &&
42 git config --add svn-remote.svn.fetch \
43 trunk:refs/remotes/svn/trunk &&
44 git config --add svn-remote.svn.fetch \
45 thunk:refs/remotes/svn/thunk &&
46 git-svn fetch -i svn/thunk &&
47 test \"\`git rev-parse --verify refs/remotes/svn/trunk\`\" \
48 = \"\`git rev-parse --verify refs/remotes/svn/thunk~1\`\" &&
49 test \"\`git cat-file blob refs/remotes/svn/thunk:readme |\
50 sed -n -e '3p'\`\" = goodbye
53 test_expect_success 'follow deleted parent' "
54 (svn cp -m 'resurrecting trunk as junk' \
55 $svnrepo/trunk@2 $svnrepo/junk ||
56 svn cp -m 'resurrecting trunk as junk' \
57 -r2 $svnrepo/trunk $svnrepo/junk) &&
58 git config --add svn-remote.svn.fetch \
59 junk:refs/remotes/svn/junk &&
60 git-svn fetch -i svn/thunk &&
61 git-svn fetch -i svn/junk &&
62 test -z \"\`git diff svn/junk svn/trunk\`\" &&
63 test \"\`git merge-base svn/junk svn/trunk\`\" \
64 = \"\`git rev-parse svn/trunk\`\"
67 test_expect_success 'follow larger parent' "
68 mkdir -p import/trunk/thunk/bump/thud &&
69 echo hi > import/trunk/thunk/bump/thud/file &&
70 svn import -m 'import a larger parent' import $svnrepo/larger-parent &&
71 svn cp -m 'hi' $svnrepo/larger-parent $svnrepo/another-larger &&
72 git-svn init --minimize-url -i larger \
73 $svnrepo/another-larger/trunk/thunk/bump/thud &&
74 git-svn fetch -i larger &&
75 git rev-parse --verify refs/remotes/larger &&
76 git rev-parse --verify \
77 refs/remotes/larger-parent/trunk/thunk/bump/thud &&
78 test \"\`git merge-base \
79 refs/remotes/larger-parent/trunk/thunk/bump/thud \
80 refs/remotes/larger\`\" = \
81 \"\`git rev-parse refs/remotes/larger\`\"
82 true
85 test_expect_success 'follow higher-level parent' "
86 svn mkdir -m 'follow higher-level parent' $svnrepo/blob &&
87 svn co $svnrepo/blob blob &&
88 cd blob &&
89 echo hi > hi &&
90 svn add hi &&
91 svn commit -m 'hihi' &&
92 cd ..
93 svn mkdir -m 'new glob at top level' $svnrepo/glob &&
94 svn mv -m 'move blob down a level' $svnrepo/blob $svnrepo/glob/blob &&
95 git-svn init --minimize-url -i blob $svnrepo/glob/blob &&
96 git-svn fetch -i blob
99 test_expect_success 'follow deleted directory' "
100 svn mv -m 'bye!' $svnrepo/glob/blob/hi $svnrepo/glob/blob/bye &&
101 svn rm -m 'remove glob' $svnrepo/glob &&
102 git-svn init --minimize-url -i glob $svnrepo/glob &&
103 git-svn fetch -i glob &&
104 test \"\`git cat-file blob refs/remotes/glob:blob/bye\`\" = hi &&
105 test \"\`git ls-tree refs/remotes/glob | wc -l \`\" -eq 1
108 # ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
109 # in trunk/subversion/bindings/swig/perl
110 test_expect_success 'follow-parent avoids deleting relevant info' "
111 mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
112 for i in a b c ; do \
113 echo \$i > import/trunk/subversion/bindings/swig/perl/\$i.pm &&
114 echo _\$i > import/trunk/subversion/bindings/swig/perl/t/\$i.t; \
115 done &&
116 echo 'bad delete test' > \
117 import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
118 echo 'bad delete test 2' > \
119 import/trunk/subversion/bindings/swig/perl/another-larger &&
120 cd import &&
121 svn import -m 'r9270 test' . $svnrepo/r9270 &&
122 cd .. &&
123 svn co $svnrepo/r9270/trunk/subversion/bindings/swig/perl r9270 &&
124 cd r9270 &&
125 svn mkdir native &&
126 svn mv t native/t &&
127 for i in a b c; do svn mv \$i.pm native/\$i.pm; done &&
128 echo z >> native/t/c.t &&
129 poke native/t/c.t &&
130 svn commit -m 'reorg test' &&
131 cd .. &&
132 git-svn init --minimize-url -i r9270-t \
133 $svnrepo/r9270/trunk/subversion/bindings/swig/perl/native/t &&
134 git-svn fetch -i r9270-t &&
135 test \`git rev-list r9270-t | wc -l\` -eq 2 &&
136 test \"\`git ls-tree --name-only r9270-t~1\`\" = \
137 \"\`git ls-tree --name-only r9270-t\`\"
140 test_expect_success "track initial change if it was only made to parent" "
141 svn cp -m 'wheee!' $svnrepo/r9270/trunk $svnrepo/r9270/drunk &&
142 git-svn init --minimize-url -i r9270-d \
143 $svnrepo/r9270/drunk/subversion/bindings/swig/perl/native/t &&
144 git-svn fetch -i r9270-d &&
145 test \`git rev-list r9270-d | wc -l\` -eq 3 &&
146 test \"\`git ls-tree --name-only r9270-t\`\" = \
147 \"\`git ls-tree --name-only r9270-d\`\" &&
148 test \"\`git rev-parse r9270-t\`\" = \
149 \"\`git rev-parse r9270-d~1\`\"
152 test_expect_success "track multi-parent paths" "
153 svn cp -m 'resurrect /glob' $svnrepo/r9270 $svnrepo/glob &&
154 git-svn multi-fetch &&
155 test \`git cat-file commit refs/remotes/glob | \
156 grep '^parent ' | wc -l\` -eq 2
159 test_expect_success "multi-fetch continues to work" "
160 git-svn multi-fetch
163 test_expect_success "multi-fetch works off a 'clean' repository" "
164 rm -r $GIT_DIR/svn $GIT_DIR/refs/remotes $GIT_DIR/logs &&
165 mkdir $GIT_DIR/svn &&
166 git-svn multi-fetch
169 test_debug 'gitk --all &'
171 test_done