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