Re: [RFC/PATCH] t9157-*.sh: Add an svn version check
From: Eric Wong <hidden>
Date: 2016-06-15 22:50:21
Subsystem:
the rest · Maintainer:
Linus Torvalds
Steven Walter [off-list ref] wrote:
On Fri, Jan 7, 2011 at 12:31 PM, Eric Wong [off-list ref] wrote:quoted
Ramsay Jones [off-list ref] wrote:quoted
Signed-off-by: Ramsay Jones <redacted> ---Consider this Acked-by: Eric Wong <redacted>Acked-by: Steven Walter <redacted>
Wait, looking through my backlog, this could fix the problem Ramsay was having but was lost in the shuffle (my fault) :x Ramsay: does this fix it?
From 9a4f35d6ff9a66b7b5e57c7124a7cd6df0adad7b Mon Sep 17 00:00:00 2001
From: Steven Walter <redacted> Date: Fri, 22 Oct 2010 21:55:58 -0400 Subject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5 Specify a revision range to "merge" and manually set the svn:mergeinfo property. Acked-by: Eric Wong <redacted> --- 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" ) &&
--
Eric Wong