Re: [RFC/PATCH] t9157-*.sh: Add an svn version check
- From
- Eric Wong <normalperson@yhbt.net>
- Date
- Jan 7, 2011, 18:02 UTC
- Message-ID
- <20110107180220.GA20031@dcvr.yhbt.net>
- In-Reply-To
- <AANLkTi=VpHtQ+x5hyfCei-=X=ry4X=+TSGg7EKa7zs4j@mail.gmail.com>
Steven Walter <stevenrwalter@gmail.com> wrote:
Show 8 quoted lines
> On Fri, Jan 7, 2011 at 12:31 PM, Eric Wong <normalperson@yhbt.net> wrote: > > Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote: > >> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> --- > > > > Consider this > > Acked-by: Eric Wong <normalperson@yhbt.net> > > Acked-by: Steven Walter <stevenrwalter@gmail.com>
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 <stevenrwalter@gmail.com> 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 <normalperson@yhbt.net> --- 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