[thirdparty/git.git] / t / t9151-svn-mergeinfo.sh

#!/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' \
	  < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
	git svn init --minimize-url -R svnmerge \
	  -T trunk -b branches '$svnrepo' &&
	git svn fetch --all
	"

test_expect_success 'represent svn merges without intervening commits' "
	[ `git cat-file commit HEAD^1 | grep parent | wc -l` -eq 2 ]
	"

test_expect_success 'represent svn merges with intervening commits' "
	[ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
	"

test_done
Commit	Line	Data
dff589ef SV	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2007, 2009 Sam Vilain
	4	#
	5
	6	test_description='git-svn svn mergeinfo properties'
	7
	8	. ./lib-git-svn.sh
	9
	10	test_expect_success 'load svn dump' "
15c6bf0d JK	11	svnadmin load -q '$rawsvnrepo' \
15c6bf0d JK	12	< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
dff589ef SV	13	git svn init --minimize-url -R svnmerge \
	14	-T trunk -b branches '$svnrepo' &&
	15	git svn fetch --all
	16	"
	17
753dc384 TA	18	test_expect_success 'represent svn merges without intervening commits' "
	19	[ `git cat-file commit HEAD^1 \| grep parent \| wc -l` -eq 2 ]
	20	"
	21
	22	test_expect_success 'represent svn merges with intervening commits' "
dff589ef SV	23	[ `git cat-file commit HEAD \| grep parent \| wc -l` -eq 2 ]
	24	"
	25
	26	test_done