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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html