69
test_expect_success 'commit another change from svn side' "
70
svn co $svnrepo t.svn &&
72
echo third line from svn >> file &&
74
svn commit -m 'third line from svn' &&
79
test_expect_failure 'multiple dcommit from git-svn will not clobber svn' "
80
git reset --hard refs/remotes/git-svn &&
81
echo new file >> new-file &&
82
git update-index --add new-file &&
83
git commit -a -m 'new file' &&
84
echo clobber > file &&
85
git commit -a -m 'clobber' &&
90
test_expect_success 'check that rebase really failed' 'test -d .dotest'
92
test_expect_success 'resolve, continue the rebase and dcommit' "
93
echo clobber and I really mean it > file &&
94
git update-index file &&
95
git rebase --continue &&