@matheusbsbs / matheus-bagliano / commits / 1978659a74
Fork 0

t9400: Add some more cvs update tests

Add some cvs update tests that include various merge situations. Also add a basic test for update -C since it fits so well in there. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Frank Lichtenheld committed May 21, 2007 at 00:31 UTC 1978659a7421098095fd6a8613302771cae81dd1
1 file changed +69
t/t9400-git-cvsserver-server.sh
+69
@@ -192,4 +192,73 @@ test_expect_success 'cvs update (re-add deleted file)' \
192 test "$(echo $(grep testfile1 CVS/Entries|cut -d/ -f2,3,5))" = "testfile1/1.4/" &&
193 diff -q testfile1 ../testfile1'
194
195 +cd "$WORKDIR"
196 +test_expect_success 'cvs update (merge)' \
197 + 'echo Line 0 >expected &&
198 + for i in 1 2 3 4 5 6 7
199 + do
200 + echo Line $i >>merge
201 + echo Line $i >>expected
202 + done &&
203 + echo Line 8 >>expected &&
204 + git add merge &&
205 + git commit -q -m "Merge test (pre-merge)" &&
206 + git push gitcvs.git >/dev/null &&
207 + cd cvswork &&
208 + GIT_CONFIG="$git_config" cvs -Q update &&
209 + test "$(echo $(grep merge CVS/Entries|cut -d/ -f2,3,5))" = "merge/1.1/" &&
210 + diff -q merge ../merge &&
211 + ( echo Line 0; cat merge ) >merge.tmp &&
212 + mv merge.tmp merge &&
213 + cd "$WORKDIR" &&
214 + echo Line 8 >>merge &&
215 + git add merge &&
216 + git commit -q -m "Merge test (merge)" &&
217 + git push gitcvs.git >/dev/null &&
218 + cd cvswork &&
219 + GIT_CONFIG="$git_config" cvs -Q update &&
220 + diff -q merge ../expected'
221 +
222 +cd "$WORKDIR"
223 +
224 +cat >expected.C <<EOF
225 +<<<<<<< merge.mine
226 +Line 0
227 +=======
228 +LINE 0
229 +>>>>>>> merge.3
230 +EOF
231 +
232 +for i in 1 2 3 4 5 6 7 8
233 +do
234 + echo Line $i >>expected.C
235 +done
236 +
237 +test_expect_success 'cvs update (conflict merge)' \
238 + '( echo LINE 0; cat merge ) >merge.tmp &&
239 + mv merge.tmp merge &&
240 + git add merge &&
241 + git commit -q -m "Merge test (conflict)" &&
242 + git push gitcvs.git >/dev/null &&
243 + cd cvswork &&
244 + GIT_CONFIG="$git_config" cvs -Q update &&
245 + diff -q merge ../expected.C'
246 +
247 +cd "$WORKDIR"
248 +test_expect_success 'cvs update (-C)' \
249 + 'cd cvswork &&
250 + GIT_CONFIG="$git_config" cvs -Q update -C &&
251 + diff -q merge ../merge'
252 +
253 +cd "$WORKDIR"
254 +test_expect_success 'cvs update (merge no-op)' \
255 + 'echo Line 9 >>merge &&
256 + cp merge cvswork/merge &&
257 + git add merge &&
258 + git commit -q -m "Merge test (no-op)" &&
259 + git push gitcvs.git >/dev/null &&
260 + cd cvswork &&
261 + GIT_CONFIG="$git_config" cvs -Q update &&
262 + diff -q merge ../merge'
263 +
264 test_done