On Thu, 2010-10-21 at 21:13 -0700, Junio C Hamano wrote: > Steven Walter (1): > git-svn: check_cherry_pick should exclude commits already in our history The new test in this commit fails with Subversion 1.4 and below (for example, on Ubuntu 6.06 and 8.04), where âsvn mergeâ required at least two arguments. Iâm guessing that with Subversion < 1.5, the test doesnât make sense and should just be skipped. Anders *** t9157-git-svn-fetch-merge.sh *** Initialized empty Git repository in /build/buildd/git-1.7.3.2/t/trash directory.t9157-git-svn-fetch-merge/.git/ expecting success: svn_cmd mkdir -m x "$svnrepo"/trunk && svn_cmd mkdir -m x "$svnrepo"/branches && svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && ( cd "$SVN_TREE" && touch foo && svn add foo && svn commit -m "initial commit" && svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && touch bar && svn add bar && svn commit -m x && svn cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch2 && svn switch "$svnrepo"/branches/branch1 && touch baz && svn add baz && svn commit -m x && svn switch "$svnrepo"/trunk && svn merge "$svnrepo"/branches/branch1 && svn commit -m "merge" && svn switch "$svnrepo"/branches/branch1 && svn commit -m x && svn switch "$svnrepo"/branches/branch2 && svn merge "$svnrepo"/branches/branch1 && svn commit -m "merge branch1" && svn switch "$svnrepo"/trunk && svn merge "$svnrepo"/branches/branch2 && svn resolved baz && svn commit -m "merge branch2" ) && rm -rf "$SVN_TREE" rm -rf "$SVN_TREE" Committed revision 1. Committed revision 2. Checked out revision 2. A foo Adding foo Transmitting file data . Committed revision 3. Committed revision 4. A bar Adding bar Transmitting file data . Committed revision 5. Committed revision 6. D bar Updated to revision 6. A baz Adding baz Transmitting file data . Committed revision 7. D baz A bar Updated to revision 7. svn: Not enough arguments provided; try 'svn help' for more info not ok - 1 initialize source svn repo -- 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