You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22 lines
473 B
22 lines
473 B
15 years ago
|
#!/bin/sh
|
||
|
|
#
|
||
|
|
# Copyright (c) 2007, 2009 Sam Vilain
|
||
|
|
#
|
||
|
|
|
||
|
|
test_description='git-svn svn mergeinfo properties'
|
||
|
|
|
||
|
|
. ./lib-git-svn.sh
|
||
|
|
|
||
|
|
test_expect_success 'load svn dump' "
|
||
|
|
svnadmin load -q '$rawsvnrepo' < '../t9151/svn-mergeinfo.dump' &&
|
||
|
|
git svn init --minimize-url -R svnmerge \
|
||
|
|
-T trunk -b branches '$svnrepo' &&
|
||
|
|
git svn fetch --all
|
||
|
|
"
|
||
|
|
|
||
|
|
test_expect_success 'svn merges were represented coming in' "
|
||
|
|
[ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
|
||
|
|
"
|
||
|
|
|
||
|
|
test_done
|