3 # Copyright (c) 2007, 2009 Sam Vilain
6 test_description='git-svn svn mergeinfo properties'
8 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
13 test_expect_success 'load svn dump' "
14 svnadmin load -q '$rawsvnrepo' \
15 < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
16 git svn init --minimize-url -R svnmerge \
17 --rewrite-root=http://svn.example.org \
18 -T trunk -b branches '$svnrepo' &&
22 test_expect_success 'all svn merges became git merge commits' '
23 unmarked=$(git rev-list --parents --all --grep=Merge |
24 grep -v " .* " | cut -f1 -d" ") &&
28 test_expect_success 'cherry picks did not become git merge commits' '
29 bad_cherries=$(git rev-list --parents --all --grep=Cherry |
30 grep " .* " | cut -f1 -d" ") &&
31 [ -z "$bad_cherries" ]
34 test_expect_success 'svn non-merge merge commits did not become git merge commits' '
35 bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
36 grep " .* " | cut -f1 -d" ") &&
37 [ -z "$bad_non_merges" ]
40 test_expect_success 'commit made to merged branch is reachable from the merge' '
41 before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
42 merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
43 not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
44 [ -z "$not_reachable" ]
47 test_expect_success 'merging two branches in one commit is detected correctly' '
48 f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
49 f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
50 merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
51 not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
52 [ -z "$not_reachable" ]
55 test_expect_failure 'everything got merged in the end' '
56 unmerged=$(git rev-list --all --not master) &&