Merge branch 'maint'
[git/vmiklos.git] / t / t9150-svk-mergetickets.sh
blobdd0c2bad24db26abdab7a91acee109978421ea3e
1 #!/bin/sh
3 # Copyright (c) 2007 Sam Vilain
6 test_description='git-svn svk merge tickets'
8 . ./lib-git-svn.sh
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 -T trunk -b branches '$svnrepo' &&
15 git svn fetch --all
18 uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
20 test_expect_success 'svk merges were represented coming in' "
21 [ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
24 test_done