submodule: Use cat instead of echo to avoid DOS line-endings
[git/dscho.git] / t / t9137-git-svn-dcommit-clobber-series.sh
blobc17aa3186f7dbf02f474345ba507969060f867ab
1 #!/bin/sh
3 # Copyright (c) 2007 Eric Wong
4 test_description='git svn dcommit clobber series'
5 . ./lib-git-svn.sh
7 test_expect_success 'initialize repo' '
8 mkdir import &&
9 (cd import &&
10 awk "BEGIN { for (i = 1; i < 64; i++) { print i } }" > file
11 svn_cmd import -m "initial" . "$svnrepo"
12 ) &&
13 git svn init "$svnrepo" &&
14 git svn fetch &&
15 test -e file
18 test_expect_success '(supposedly) non-conflicting change from SVN' '
19 test x"`sed -n -e 58p < file`" = x58 &&
20 test x"`sed -n -e 61p < file`" = x61 &&
21 svn_cmd co "$svnrepo" tmp &&
22 (cd tmp &&
23 "$PERL_PATH" -i.bak -p -e "s/^58$/5588/" file &&
24 "$PERL_PATH" -i.bak -p -e "s/^61$/6611/" file &&
25 poke file &&
26 test x"`sed -n -e 58p < file`" = x5588 &&
27 test x"`sed -n -e 61p < file`" = x6611 &&
28 svn_cmd commit -m "58 => 5588, 61 => 6611"
32 test_expect_success 'some unrelated changes to git' "
33 echo hi > life &&
34 git update-index --add life &&
35 git commit -m hi-life &&
36 echo bye >> life &&
37 git commit -m bye-life life
40 test_expect_success 'change file but in unrelated area' "
41 test x\"\`sed -n -e 4p < file\`\" = x4 &&
42 test x\"\`sed -n -e 7p < file\`\" = x7 &&
43 "$PERL_PATH" -i.bak -p -e 's/^4\$/4444/' file &&
44 "$PERL_PATH" -i.bak -p -e 's/^7\$/7777/' file &&
45 test x\"\`sed -n -e 4p < file\`\" = x4444 &&
46 test x\"\`sed -n -e 7p < file\`\" = x7777 &&
47 git commit -m '4 => 4444, 7 => 7777' file &&
48 git svn dcommit &&
49 svn_cmd up tmp &&
50 cd tmp &&
51 test x\"\`sed -n -e 4p < file\`\" = x4444 &&
52 test x\"\`sed -n -e 7p < file\`\" = x7777 &&
53 test x\"\`sed -n -e 58p < file\`\" = x5588 &&
54 test x\"\`sed -n -e 61p < file\`\" = x6611
57 test_expect_success 'attempt to dcommit with a dirty index' '
58 echo foo >>file &&
59 git add file &&
60 test_must_fail git svn dcommit
63 test_done