]>
Commit | Line | Data |
---|---|---|
f1264bd6 SV |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007 Sam Vilain | |
4 | # | |
5 | ||
6 | test_description='git-svn svk merge tickets' | |
7 | ||
8 | . ./lib-git-svn.sh | |
9 | ||
10 | test_expect_success 'load svk depot' " | |
15c6bf0d JK |
11 | svnadmin load -q '$rawsvnrepo' \ |
12 | < '$TEST_DIRECTORY/t9150/svk-merge.dump' && | |
f1264bd6 | 13 | git svn init --minimize-url -R svkmerge \ |
95109f29 | 14 | --rewrite-root=http://svn.example.org \ |
f1264bd6 SV |
15 | -T trunk -b branches '$svnrepo' && |
16 | git svn fetch --all | |
17 | " | |
18 | ||
19 | uuid=b48289b2-9c08-4d72-af37-0358a40b9c15 | |
20 | ||
21 | test_expect_success 'svk merges were represented coming in' " | |
9375dcf3 | 22 | [ $(git cat-file commit HEAD | grep parent | wc -l) -eq 2 ] |
f1264bd6 SV |
23 | " |
24 | ||
25 | test_done |