]>
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 | ||
a881baa2 | 8 | GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main |
334afbc7 JS |
9 | export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME |
10 | ||
dff589ef SV |
11 | . ./lib-git-svn.sh |
12 | ||
13 | test_expect_success 'load svn dump' " | |
15c6bf0d | 14 | svnadmin load -q '$rawsvnrepo' \ |
4669917e | 15 | <'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' && |
dff589ef | 16 | git svn init --minimize-url -R svnmerge \ |
95109f29 | 17 | --rewrite-root=http://svn.example.org \ |
dff589ef SV |
18 | -T trunk -b branches '$svnrepo' && |
19 | git svn fetch --all | |
4669917e | 20 | " |
dff589ef | 21 | |
7a955a53 | 22 | test_expect_success 'all svn merges became git merge commits' ' |
796c248d | 23 | git rev-list --all --no-merges --grep=Merge >unmarked && |
f918a89e | 24 | test_must_be_empty unmarked |
4669917e | 25 | ' |
753dc384 | 26 | |
7a955a53 | 27 | test_expect_success 'cherry picks did not become git merge commits' ' |
796c248d | 28 | git rev-list --all --merges --grep=Cherry >bad-cherries && |
f918a89e | 29 | test_must_be_empty bad-cherries |
4669917e | 30 | ' |
1d144aa2 SV |
31 | |
32 | test_expect_success 'svn non-merge merge commits did not become git merge commits' ' | |
796c248d | 33 | git rev-list --all --merges --grep=non-merge >bad-non-merges && |
f918a89e | 34 | test_must_be_empty bad-non-merges |
4669917e | 35 | ' |
1d144aa2 | 36 | |
6a2009e7 | 37 | test_expect_success 'commit made to merged branch is reachable from the merge' ' |
a48fcd83 JN |
38 | before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") && |
39 | merge_commit=$(git rev-list --all --grep="Merge trunk to b2") && | |
f918a89e ÆAB |
40 | git rev-list -1 $before_commit --not $merge_commit >not-reachable && |
41 | test_must_be_empty not-reachable | |
4669917e | 42 | ' |
9560808f TS |
43 | |
44 | test_expect_success 'merging two branches in one commit is detected correctly' ' | |
a48fcd83 JN |
45 | f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") && |
46 | f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") && | |
47 | merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") && | |
f918a89e ÆAB |
48 | git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable && |
49 | test_must_be_empty not-reachable | |
4669917e | 50 | ' |
9560808f | 51 | |
c79f1189 | 52 | test_expect_failure 'everything got merged in the end' ' |
2c873f97 | 53 | git rev-list --all --not main >unmerged && |
f918a89e | 54 | test_must_be_empty unmerged |
4669917e | 55 | ' |
dff589ef SV |
56 | |
57 | test_done |