From: Steven Walter Date: Sat, 23 Oct 2010 01:55:58 GMT Subject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Message-ID: <1287798958-22549-1-git-send-email-stevenrwalter@gmail.com> In-Reply-To: <1287737937.3785.15.camel@balanced-tree> Specify a revision range to "merge" and manually set the svn:mergeinfo property. --- t/t9157-git-svn-fetch-merge.sh | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh index da582c5..424e1fa 100755 --- a/t/t9157-git-svn-fetch-merge.sh +++ b/t/t9157-git-svn-fetch-merge.sh @@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' ' svn add baz && svn commit -m x && svn switch "$svnrepo"/trunk && - svn merge "$svnrepo"/branches/branch1 && + svn merge -r3:7 "$svnrepo"/branches/branch1 && + svn propset svn:mergeinfo "/branches/branch1:4-7" . && svn commit -m "merge" && svn switch "$svnrepo"/branches/branch1 && svn commit -m x && svn switch "$svnrepo"/branches/branch2 && - svn merge "$svnrepo"/branches/branch1 && + svn merge -r3:8 "$svnrepo"/branches/branch1 && + svn propset svn:mergeinfo "/branches/branch1:4-8" . && svn commit -m "merge branch1" && svn switch "$svnrepo"/trunk && - svn merge "$svnrepo"/branches/branch2 && + svn merge -r5:9 "$svnrepo"/branches/branch2 && + svn propset svn:mergeinfo "/branches/branch1:4-8 +/branches/branch2:6-9" . && svn resolved baz && svn commit -m "merge branch2" ) && -- 1.6.3.3