Merge commit 'refs/top-bases/t/extra-actions/log-consolidate' into t/extra-actions...
[git/gitweb.git] / t / t9151-svn-mergeinfo.sh
blob9bee516358bd98d1b5c701f6aa0c4f3e4d95bd45
1 #!/bin/sh
3 # Copyright (c) 2007, 2009 Sam Vilain
6 test_description='git-svn svn mergeinfo properties'
8 . ./lib-git-svn.sh
10 test_expect_success 'load svn dump' "
11 svnadmin load -q '$rawsvnrepo' \
12 < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
13 git svn init --minimize-url -R svnmerge \
14 -T trunk -b branches '$svnrepo' &&
15 git svn fetch --all
18 test_expect_success 'svn merges were represented coming in' "
19 [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
22 test_done