From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 18 Nov 2010 21:15:59 GMT
Subject: Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5
Message-ID: <alpine.DEB.2.02.1011181606340.14285@dr-wily.mit.edu>
In-Reply-To: <1287798958-22549-1-git-send-email-stevenrwalter@gmail.com>

Junio: Did this get lost?  It fixes a test suite regression between 
v1.7.3.1 and v1.7.3.2 on systems with Subversion 1.4.

Steven: Can you sign off on your commit?

Anders

On Fri, 22 Oct 2010, Steven Walter wrote:

> 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
> 
>