Re: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5

From: Anders Kaseorg <andersk@mit.edu>
Date: Nov 18, 2010, 23:35 UTC
Message-ID: <alpine.DEB.2.02.1011181826560.14285@dr-wily.mit.edu>
In-Reply-To: <alpine.DEB.2.02.1011181606340.14285@dr-wily.mit.edu>

On Thu, 18 Nov 2010, Anders Kaseorg wrote:

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

Hmm, perhaps I spoke too soon; when I actually run the patched test on an Ubuntu 8.04 system, I still get a failure. Apparently Subversion 1.4 thinks the manually set svn:mergeinfo properties cause conflicts:

+ svn merge -r5:9 file:///tmp/andersk/git/t/trash directory.t9157-git-svn-fetch-merge/svnrepo/branches/branch2
A    baz
 C   .
+ svn propset svn:mergeinfo /branches/branch1:4-8
/branches/branch2:6-9 .
property 'svn:mergeinfo' set on '.'
+ svn resolved baz
+ svn commit -m merge branch2
svn: Commit failed (details follow):
svn: Aborting commit: '/tmp/andersk/git/t/trash directory.t9157-git-svn-fetch-merge/.git/svn/refs/remotes/git-svn/svn-tree' remains in conflict

Anders