X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9158-git-svn-mergeinfo.sh;h=8c9539e1b47a817fff98bad1ed1a99e890386ec9;hb=96b8d93a539f3a9f43f0fc38214db8753cac3c2e;hp=3ab43902b3412d887794b7ca41d37b67af657361;hpb=a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a;p=git.git diff --git a/t/t9158-git-svn-mergeinfo.sh b/t/t9158-git-svn-mergeinfo.sh index 3ab43902b..8c9539e1b 100755 --- a/t/t9158-git-svn-mergeinfo.sh +++ b/t/t9158-git-svn-mergeinfo.sh @@ -38,4 +38,17 @@ test_expect_success 'verify svn:mergeinfo' ' 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