1#!/bin/sh
2#
3# Copyright (c) 2007 Sam Vilain
4#
5
6test_description='git-svn svk merge tickets'
7
8. ./lib-git-svn.sh
9
10test_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
17	"
18
19uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
20
21test_expect_success 'svk merges were represented coming in' "
22	[ $(git cat-file commit HEAD | grep parent | wc -l) -eq 2 ]
23	"
24
25test_done
26