{"thread":{"id":"26219","subject":"[RFC/PATCH] t9157-*.sh: Add an svn version check","startedAt":"2011-01-06T18:29:23Z","lastAt":"2011-01-11T18:21:46Z","messageCount":10,"participants":["Ramsay Jones","Eric Wong","Steven Walter","Jonathan Nieder","Junio C Hamano","Anders Kaseorg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"159048","messageId":"4D260A03.90903@ramsay1.demon.co.uk","threadId":"26219","inReplyTo":null,"subject":"[RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2011-01-06T18:29:23Z","receivedAt":"2011-01-06T18:29:23Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones \n---\n\nThis test fails for me, because my svn version(s) are too old (1.4.3 and 1.4.6), and\nso I've got into the habit of running the tests with NO_SVN_TESTS=1. (which is a bit\nof a shame in terms of test coverage, but it is *much* quicker!)\n\nI don't know the details, but it seems that the 'svn merge' of this vintage does not\nsupport the operations required by this test. Unfortunately, I don't know what the\nminimum required version of svn is, so I'm hoping that someone can take this patch\nand fix it up properly ...\n\nATB,\nRamsay Jones\n\n t/t9157-git-svn-fetch-merge.sh | 8 ++++++++\n 1 files changed, 8 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh\nindex da582c5..accf61e 100755\n--- a/t/t9157-git-svn-fetch-merge.sh\n+++ b/t/t9157-git-svn-fetch-merge.sh\n@@ -6,6 +6,14 @@\n test_description='git svn merge detection'\n . ./lib-git-svn.sh\n \n+svn_ver=\"$(svn --version --quiet)\"\n+case $svn_ver in\n+[0-1].[0-4].[0-6])\n+\tskip_all=\"skipping git-svn test - SVN too old ($svn_ver)\"\n+\ttest_done\n+\t;;\n+esac\n+\n test_expect_success 'initialize source svn repo' '\n \tsvn_cmd mkdir -m x \"$svnrepo\"/trunk &&\n \tsvn_cmd mkdir -m x \"$svnrepo\"/branches &&\n-- \n1.7.3\n"},{"id":"159119","messageId":"20110107173114.GA31376@dcvr.yhbt.net","threadId":"26219","inReplyTo":"4D260A03.90903@ramsay1.demon.co.uk","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2011-01-07T17:31:14Z","receivedAt":"2011-01-07T17:31:14Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Ramsay Jones wrote:\n> Signed-off-by: Ramsay Jones ---\n> \n> This test fails for me, because my svn version(s) are too old (1.4.3\n> and 1.4.6), and so I've got into the habit of running the tests with\n> NO_SVN_TESTS=1. (which is a bit of a shame in terms of test coverage,\n> but it is *much* quicker!)\n> \n> I don't know the details, but it seems that the 'svn merge' of this\n> vintage does not support the operations required by this test.\n> Unfortunately, I don't know what the minimum required version of svn\n> is, so I'm hoping that someone can take this patch and fix it up\n> properly ...\n\nI'm fine taking this patch as-is or even making it just apply to all\n1.4.x versions. 1.5+ has been out for ages now and eventually the rest\nof the world will just upgrade.\n\nConsider this\nAcked-by: Eric Wong \n\n-- \nEric Wong\n"},{"id":"159121","messageId":"AANLkTi=VpHtQ+x5hyfCei-=X=ry4X=+TSGg7EKa7zs4j@mail.gmail.com","threadId":"26219","inReplyTo":"20110107173114.GA31376@dcvr.yhbt.net","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Steven Walter","fromEmail":"stevenrwalter@gmail.com","sentAt":"2011-01-07T17:44:55Z","receivedAt":"2011-01-07T17:44:55Z","isPatch":true,"sender":{"key":"stevenrwalter@gmail.com","avatar":"https://avatars.githubusercontent.com/u/79127?v=4"},"body":"On Fri, Jan 7, 2011 at 12:31 PM, Eric Wong wrote:\n> Ramsay Jones wrote:\n>> Signed-off-by: Ramsay Jones ---\n>\n> Consider this\n> Acked-by: Eric Wong \n\nAcked-by: Steven Walter \n-- \n-Steven Walter \n"},{"id":"159123","messageId":"20110107180220.GA20031@dcvr.yhbt.net","threadId":"26219","inReplyTo":"AANLkTi=VpHtQ+x5hyfCei-=X=ry4X=+TSGg7EKa7zs4j@mail.gmail.com","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2011-01-07T18:02:20Z","receivedAt":"2011-01-07T18:02:20Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Steven Walter wrote:\n> On Fri, Jan 7, 2011 at 12:31 PM, Eric Wong wrote:\n> > Ramsay Jones wrote:\n> >> Signed-off-by: Ramsay Jones ---\n> >\n> > Consider this\n> > Acked-by: Eric Wong \n> \n> Acked-by: Steven Walter \n\nWait, looking through my backlog, this could fix the problem\nRamsay was having but was lost in the shuffle (my fault) :x\n\nRamsay: does this fix it?\n\n>From 9a4f35d6ff9a66b7b5e57c7124a7cd6df0adad7b Mon Sep 17 00:00:00 2001\nFrom: Steven Walter \nDate: Fri, 22 Oct 2010 21:55:58 -0400\nSubject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5\n\nSpecify a revision range to \"merge\" and manually set the svn:mergeinfo\nproperty.\n\nAcked-by: Eric Wong \n---\n t/t9157-git-svn-fetch-merge.sh | 10 +++++++---\n 1 files changed, 7 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh\nindex da582c5..424e1fa 100755\n--- a/t/t9157-git-svn-fetch-merge.sh\n+++ b/t/t9157-git-svn-fetch-merge.sh\n@@ -25,15 +25,19 @@ test_expect_success 'initialize source svn repo' '\n \t\tsvn add baz &&\n \t\tsvn commit -m x &&\n \t\tsvn switch \"$svnrepo\"/trunk &&\n-\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn merge -r3:7 \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-7\" . &&\n \t\tsvn commit -m \"merge\" &&\n \t\tsvn switch \"$svnrepo\"/branches/branch1 &&\n \t\tsvn commit -m x &&\n \t\tsvn switch \"$svnrepo\"/branches/branch2 &&\n-\t\tsvn merge \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn merge -r3:8 \"$svnrepo\"/branches/branch1 &&\n+\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-8\" . &&\n \t\tsvn commit -m \"merge branch1\" &&\n \t\tsvn switch \"$svnrepo\"/trunk &&\n-\t\tsvn merge \"$svnrepo\"/branches/branch2 &&\n+\t\tsvn merge -r5:9 \"$svnrepo\"/branches/branch2 &&\n+\t\tsvn propset svn:mergeinfo \"/branches/branch1:4-8\n+/branches/branch2:6-9\" . &&\n \t\tsvn resolved baz &&\n \t\tsvn commit -m \"merge branch2\"\n \t) &&\n-- \nEric Wong\n"},{"id":"159126","messageId":"20110107181946.GB28980@burratino","threadId":"26219","inReplyTo":"20110107180220.GA20031@dcvr.yhbt.net","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2011-01-07T18:19:46Z","receivedAt":"2011-01-07T18:19:46Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Eric Wong wrote:\n\n> Wait, looking through my backlog, this could fix the problem\n> Ramsay was having but was lost in the shuffle (my fault) :x\n> \n> Ramsay: does this fix it?\n> \n> From 9a4f35d6ff9a66b7b5e57c7124a7cd6df0adad7b Mon Sep 17 00:00:00 2001\n> From: Steven Walter \n> Date: Fri, 22 Oct 2010 21:55:58 -0400\n> Subject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5\n\nContext, for reference:\n\n http://thread.gmane.org/gmane.linux.kernel/1052314/focus=161717\n"},{"id":"159130","messageId":"20110107183931.GA5560@dcvr.yhbt.net","threadId":"26219","inReplyTo":"20110107181946.GB28980@burratino","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2011-01-07T18:39:31Z","receivedAt":"2011-01-07T18:39:31Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Jonathan Nieder wrote:\n> Eric Wong wrote:\n> \n> > Wait, looking through my backlog, this could fix the problem\n> > Ramsay was having but was lost in the shuffle (my fault) :x\n> > \n> > Ramsay: does this fix it?\n> > \n> > From 9a4f35d6ff9a66b7b5e57c7124a7cd6df0adad7b Mon Sep 17 00:00:00 2001\n> > From: Steven Walter \n> > Date: Fri, 22 Oct 2010 21:55:58 -0400\n> > Subject: [PATCH] t9157-git-svn-fetch-merge.sh: remove dependency on subversion 1.5\n> \n> Context, for reference:\n> \n> http://thread.gmane.org/gmane.linux.kernel/1052314/focus=161717\n\nAh thanks, I completely forgot about that, too :x I'll take Ramsay's\npatch.\n\n-- \nEric Wong\n"},{"id":"159170","messageId":"20110107222232.GA10624@dcvr.yhbt.net","threadId":"26219","inReplyTo":"AANLkTi=VpHtQ+x5hyfCei-=X=ry4X=+TSGg7EKa7zs4j@mail.gmail.com","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2011-01-07T22:22:32Z","receivedAt":"2011-01-07T22:22:32Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Steven Walter wrote:\n> On Fri, Jan 7, 2011 at 12:31 PM, Eric Wong wrote:\n> > Ramsay Jones wrote:\n> >> Signed-off-by: Ramsay Jones ---\n> >\n> > Consider this\n> > Acked-by: Eric Wong \n> \n> Acked-by: Steven Walter \n\nI've pushed out Ramsay's patch along with a small manpage fix\nthat was mailed to me privately to git://git.bogomips.org/git-svn.git\n\nRamsay Allan Jones (1):\n t9157-*.sh: Add an svn version check\n\nStephenB (1):\n git svn: fix the final example in man page\n\n-- \nEric Wong\n"},{"id":"159172","messageId":"7vy66w4a64.fsf@alter.siamese.dyndns.org","threadId":"26219","inReplyTo":"20110107222232.GA10624@dcvr.yhbt.net","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-01-07T22:32:35Z","receivedAt":"2011-01-07T22:32:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks!\n"},{"id":"159207","messageId":"1294478342.2791.4.camel@fixed-disk","threadId":"26219","inReplyTo":"4D260A03.90903@ramsay1.demon.co.uk","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Anders Kaseorg","fromEmail":"andersk@mit.edu","sentAt":"2011-01-08T09:19:02Z","receivedAt":"2011-01-08T09:19:02Z","isPatch":true,"sender":{"key":"andersk@mit.edu","avatar":"https://avatars.githubusercontent.com/u/26471?v=4"},"body":"On Thu, 2011-01-06 at 18:29 +0000, Ramsay Jones wrote:\n> +svn_ver=\"$(svn --version --quiet)\"\n> +case $svn_ver in\n> +[0-1].[0-4].[0-6])\n\nThanks for the patch. Can I suggest the more precise\n\n0.* | 1.[0-4].*)\n\nAnders\n"},{"id":"159360","messageId":"4D2C9FBA.9080306@ramsay1.demon.co.uk","threadId":"26219","inReplyTo":"1294478342.2791.4.camel@fixed-disk","subject":"Re: [RFC/PATCH] t9157-*.sh: Add an svn version check","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2011-01-11T18:21:46Z","receivedAt":"2011-01-11T18:21:46Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"Anders Kaseorg wrote:\n> On Thu, 2011-01-06 at 18:29 +0000, Ramsay Jones wrote:\n>> +svn_ver=\"$(svn --version --quiet)\"\n>> +case $svn_ver in\n>> +[0-1].[0-4].[0-6])\n> \n> Thanks for the patch. Can I suggest the more precise\n> \n> 0.* | 1.[0-4].*)\n> \n\nHeh, yeah that would be more accurate! Thanks. ;-)\n\nJunio, I've attached a fix-up patch below...\n\nATB,\nRamsay Jones\n\n--- >8 ---\nFrom: Ramsay Jones \nDate: Mon, 10 Jan 2011 23:21:26 +0000\nSubject: [PATCH] t9157-*.sh: Make the svn version check more precise\n\nThese tests require an svn version 1.5 or newer to run correctly.\nIn particular, all 1.4.x versions and earlier are too old, so fix\nup the case label regex to cover this range exactly.\n\n[Fix provided by Anders Kaseorg ]\n\nSigned-off-by: Ramsay Jones \n---\n t/t9157-git-svn-fetch-merge.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh\nindex accf61e..991d2aa 100755\n--- a/t/t9157-git-svn-fetch-merge.sh\n+++ b/t/t9157-git-svn-fetch-merge.sh\n@@ -8,7 +8,7 @@ test_description='git svn merge detection'\n \n svn_ver=\"$(svn --version --quiet)\"\n case $svn_ver in\n-[0-1].[0-4].[0-6])\n+0.* | 1.[0-4].*)\n \tskip_all=\"skipping git-svn test - SVN too old ($svn_ver)\"\n \ttest_done\n \t;;\n-- \n1.7.3\n"}]}