Merge 'poll-busy-wait' into HEAD
[git/mingw/4msysgit.git] / t / t9150-svk-mergetickets.sh
blob24c2421bfc1acd7248fc8094ad76096f12579992
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 --rewrite-root=http://svn.example.org \
15 -T trunk -b branches '$svnrepo' &&
16 git svn fetch --all
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 ]
25 test_done