3 # Copyright (c) 2007 Sam Vilain
6 test_description
='git-svn svk merge tickets'
10 test_expect_success
'load svk depot' "
11 svnadmin load -q '$rawsvnrepo' \
12 < '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
13 git svn init --minimize-url -R svkmerge \
14 --rewrite-root=http://svn.example.org \
15 -T trunk -b branches '$svnrepo' &&
19 uuid
=b48289b2-9c08-4d72-af37-0358a40b9c15
21 test_expect_success
'svk merges were represented coming in' "
22 [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]