]>
Commit | Line | Data |
---|---|---|
f271fad2 SW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2012 Steven Walter | |
4 | # | |
5 | ||
6 | test_description='git svn merge detection' | |
7 | . ./lib-git-svn.sh | |
8 | ||
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 | |
14 | ;; | |
15 | esac | |
16 | ||
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" && | |
21 | ( | |
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 | touch bar2 && | |
38 | svn_cmd add bar2 && | |
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" | |
46 | ) && | |
47 | rm -rf "$SVN_TREE" | |
48 | ' | |
49 | ||
50 | test_expect_success 'clone svn repo' ' | |
51 | git svn init -s "$svnrepo" && | |
52 | git svn fetch | |
53 | ' | |
54 | ||
55 | test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) && | |
56 | y=$(git rev-parse branch2) && | |
57 | test "x$x" = "x$y" | |
58 | ' | |
59 | ||
60 | test_done |