3 # Copyright (c) 2012 Steven Walter
6 test_description
='git svn merge detection'
9 svn_ver
="$(svn --version --quiet)"
12 skip_all
="skipping git-svn test - SVN too old ($svn_ver)"
17 test_expect_success
'initialize source svn repo' '
18 svn_cmd mkdir -m x "$svnrepo"/trunk &&
19 svn_cmd mkdir -m x "$svnrepo"/branches &&
20 svn_cmd co "$svnrepo"/trunk "$SVN_TREE" &&
25 svn_cmd commit -m "initial commit" &&
26 svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 &&
27 svn_cmd switch "$svnrepo"/branches/branch1 &&
30 svn_cmd commit -m branch1 &&
31 svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 &&
32 svn_cmd switch "$svnrepo"/branches/branch2 &&
35 svn_cmd commit -m branch2 &&
36 svn_cmd switch "$svnrepo"/trunk &&
39 svn_cmd commit -m trunk &&
40 svn_cmd switch "$svnrepo"/branches/branch2 &&
41 svn_cmd merge "$svnrepo"/trunk &&
42 svn_cmd commit -m "merge trunk"
43 svn_cmd switch "$svnrepo"/trunk &&
44 svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
45 svn_cmd commit -m "merge branch2"
50 test_expect_success
'clone svn repo' '
51 git svn init -s "$svnrepo" &&
55 test_expect_success
'verify merge commit' 'x=$(git rev-parse HEAD^2) &&
56 y=$(git rev-parse branch2) &&