2009-10-20 04:42:01 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Sam Vilain
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='git-svn svk merge tickets'
|
|
|
|
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
|
|
|
|
test_expect_success 'load svk depot' "
|
2009-10-30 21:10:17 +01:00
|
|
|
svnadmin load -q '$rawsvnrepo' \
|
|
|
|
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
|
2009-10-20 04:42:01 +02:00
|
|
|
git svn init --minimize-url -R svkmerge \
|
2010-02-24 19:09:02 +01:00
|
|
|
--rewrite-root=http://svn.example.org \
|
2009-10-20 04:42:01 +02:00
|
|
|
-T trunk -b branches '$svnrepo' &&
|
|
|
|
git svn fetch --all
|
|
|
|
"
|
|
|
|
|
|
|
|
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
|
|
|
|
|
|
|
|
test_expect_success 'svk merges were represented coming in' "
|
2009-11-28 19:38:55 +01:00
|
|
|
[ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
|
2009-10-20 04:42:01 +02:00
|
|
|
"
|
|
|
|
|
|
|
|
test_done
|