Merge branch 'jk/enable-test-lint-by-default' into maint
[git/jnareb-git.git] / t / t9166-git-svn-fetch-merge-branch-of-branch2.sh
blobaf0ec0e2e3d6508f9a65c250f7db40bec5c1a756
1 #!/bin/sh
3 # Copyright (c) 2012 Steven Walter
6 test_description='git svn merge detection'
7 . ./lib-git-svn.sh
9 svn_ver="$(svn --version --quiet)"
10 case $svn_ver in
11 0.* | 1.[0-4].*)
12 skip_all="skipping git-svn test - SVN too old ($svn_ver)"
13 test_done
15 esac
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" &&
22 cd "$SVN_TREE" &&
23 touch foo &&
24 svn_cmd add foo &&
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 &&
28 touch bar &&
29 svn_cmd add bar &&
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 &&
33 touch baz &&
34 svn_cmd add baz &&
35 svn_cmd commit -m branch2 &&
36 svn_cmd switch "$svnrepo"/trunk &&
37 svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 &&
38 svn_cmd commit -m "merge branch2"
39 ) &&
40 rm -rf "$SVN_TREE"
43 test_expect_success 'clone svn repo' '
44 git svn init -s "$svnrepo" &&
45 git svn fetch
48 test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) &&
49 y=$(git rev-parse branch2) &&
50 test "x$x" = "x$y"
53 test_done