From 400e58b74e701398bd7e51bd3f102f31cc45ee93 Mon Sep 17 00:00:00 2001 From: Sam Vilain Date: Fri, 21 Sep 2007 14:02:33 +1200 Subject: [PATCH 1/3] git-svn: fix test for trunk svn (commit message not needed) The 'svn mv -m "rename to thunk"' was a local operation, therefore not needing a commit message, it was silently ignored. Newer svn clients will instead raise an error. Signed-off-by: Sam Vilain Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- t/t9104-git-svn-follow-parent.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index d8f9cab35d..9eab94569f 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -19,8 +19,7 @@ test_expect_success 'initialize repo' " poke trunk/readme && svn commit -m 'another commit' && svn up && - svn mv -m 'rename to thunk' trunk thunk && - svn up && + svn mv trunk thunk && echo goodbye >> thunk/readme && poke thunk/readme && svn commit -m 'bye now' && From d99c74e2913ab098953bd5b422b95f39e2dcfb55 Mon Sep 17 00:00:00 2001 From: Sam Vilain Date: Fri, 21 Sep 2007 14:02:34 +1200 Subject: [PATCH 2/3] git-svn: fix test for trunk svn (transaction out of date) Older svn clients did not raise a 'transaction out of date' error here, but trunk does - so 'svn up'. Signed-off-by: Sam Vilain Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- t/t9101-git-svn-props.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh index 622ea1c0df..5aac644223 100755 --- a/t/t9101-git-svn-props.sh +++ b/t/t9101-git-svn-props.sh @@ -140,6 +140,7 @@ test_expect_success 'test show-ignore' " cd test_wc && mkdir -p deeply/nested/directory && svn add deeply && + svn up && svn propset -R svn:ignore 'no-such-file*' . svn commit -m 'propset svn:ignore' cd .. && From ffab62681cf420abb87aabf3fd2fc96e000877e4 Mon Sep 17 00:00:00 2001 From: Sam Vilain Date: Fri, 21 Sep 2007 15:27:01 +1200 Subject: [PATCH 3/3] git-svn: handle changed svn command-line syntax Previously, if you passed a revision and a path to svn cp, it meant to look back at that revision and select that path. New behaviour is to get the path then go back to the revision (like other commands that accept @REV or -rREV do). The more consistent syntax is not supported by the old tools, so we have to try both in turn. Signed-off-by: Sam Vilain Acked-by: Eric Wong Signed-off-by: Junio C Hamano --- t/t9104-git-svn-follow-parent.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index 9eab94569f..7ba76309ac 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -51,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' " " test_expect_success 'follow deleted parent' " - svn cp -m 'resurrecting trunk as junk' \ - -r2 $svnrepo/trunk $svnrepo/junk && + (svn cp -m 'resurrecting trunk as junk' \ + $svnrepo/trunk@2 $svnrepo/junk || + svn cp -m 'resurrecting trunk as junk' \ + -r2 $svnrepo/trunk $svnrepo/junk) && git config --add svn-remote.svn.fetch \ junk:refs/remotes/svn/junk && git-svn fetch -i svn/thunk &&