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.
52 lines
1.1 KiB
52 lines
1.1 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2010 Steven Walter |
|
# |
|
|
|
test_description='git svn mergeinfo propagation' |
|
|
|
. ./lib-git-svn.sh |
|
|
|
test_expect_success 'initialize source svn repo' ' |
|
svn_cmd mkdir -m x "$svnrepo"/trunk && |
|
svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && |
|
( |
|
cd "$SVN_TREE" && |
|
touch foo && |
|
svn_cmd add foo && |
|
svn_cmd commit -m "initial commit" |
|
) && |
|
rm -rf "$SVN_TREE" |
|
' |
|
|
|
test_expect_success 'clone svn repo' ' |
|
git svn init "$svnrepo"/trunk && |
|
git svn fetch |
|
' |
|
|
|
test_expect_success 'change svn:mergeinfo' ' |
|
touch bar && |
|
git add bar && |
|
git commit -m "bar" && |
|
git svn dcommit --mergeinfo="/branches/foo:1-10" |
|
' |
|
|
|
test_expect_success 'verify svn:mergeinfo' ' |
|
mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) && |
|
test "$mergeinfo" = "/branches/foo:1-10" |
|
' |
|
|
|
test_expect_success 'change svn:mergeinfo multiline' ' |
|
touch baz && |
|
git add baz && |
|
git commit -m "baz" && |
|
git svn dcommit --mergeinfo="/branches/bar:1-10 /branches/other:3-5,8,10-11" |
|
' |
|
|
|
test_expect_success 'verify svn:mergeinfo multiline' ' |
|
mergeinfo=$(svn_cmd propget svn:mergeinfo "$svnrepo"/trunk) && |
|
test "$mergeinfo" = "/branches/bar:1-10 |
|
/branches/other:3-5,8,10-11" |
|
' |
|
|
|
test_done
|
|
|