Commit | Line | Data |
---|---|---|
dff589ef SV |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007, 2009 Sam Vilain | |
4 | # | |
5 | ||
6 | test_description='git-svn svn mergeinfo properties' | |
7 | ||
8 | . ./lib-git-svn.sh | |
9 | ||
10 | test_expect_success 'load svn dump' " | |
15c6bf0d JK |
11 | svnadmin load -q '$rawsvnrepo' \ |
12 | < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' && | |
dff589ef SV |
13 | git svn init --minimize-url -R svnmerge \ |
14 | -T trunk -b branches '$svnrepo' && | |
15 | git svn fetch --all | |
16 | " | |
17 | ||
7a955a53 | 18 | test_expect_success 'all svn merges became git merge commits' ' |
1d144aa2 SV |
19 | unmarked=$(git rev-list --parents --all --grep=Merge | |
20 | grep -v " .* " | cut -f1 -d" ") | |
21 | [ -z "$unmarked" ] | |
22 | ' | |
753dc384 | 23 | |
7a955a53 | 24 | test_expect_success 'cherry picks did not become git merge commits' ' |
1d144aa2 SV |
25 | bad_cherries=$(git rev-list --parents --all --grep=Cherry | |
26 | grep " .* " | cut -f1 -d" ") | |
27 | [ -z "$bad_cherries" ] | |
28 | ' | |
29 | ||
30 | test_expect_success 'svn non-merge merge commits did not become git merge commits' ' | |
31 | bad_non_merges=$(git rev-list --parents --all --grep=non-merge | | |
32 | grep " .* " | cut -f1 -d" ") | |
33 | [ -z "$bad_non_merges" ] | |
34 | ' | |
35 | ||
c79f1189 | 36 | test_expect_failure 'everything got merged in the end' ' |
1d144aa2 SV |
37 | unmerged=$(git rev-list --all --not master) |
38 | [ -z "$unmerged" ] | |
39 | ' | |
dff589ef SV |
40 | |
41 | test_done |