{"thread":{"id":"22894","subject":"[PATCH] t9119-git-svn-info.sh: test with svn 1.6.* as well","startedAt":"2010-03-03T17:08:24Z","lastAt":"2010-03-04T09:47:08Z","messageCount":5,"participants":["Michael J Gruber","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"136082","messageId":"d16ad252f24db9274bc9a5bcab959524eab823ed.1267636051.git.git@drmicha.warpmail.net","threadId":"22894","inReplyTo":null,"subject":"[PATCH] t9119-git-svn-info.sh: test with svn 1.6.* as well","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-03-03T17:08:24Z","receivedAt":"2010-03-03T17:08:24Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"All tests in t9119 were disabled for subversion versions other than\n1.[45].*. Adjust the single test where svn 1.6.* output is slightly\ndifferent to ignore the differing line, and make the test script\nrun with subversion 1.[456].*.\n\nSigned-off-by: Michael J Gruber \n---\n t/t9119-git-svn-info.sh | 5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh\nindex 95741cb..eff4ae2 100755\n--- a/t/t9119-git-svn-info.sh\n+++ b/t/t9119-git-svn-info.sh\n@@ -7,9 +7,10 @@ test_description='git svn info'\n . ./lib-git-svn.sh\n \n # Tested with: svn, version 1.4.4 (r25188)\n+# Tested with: svn, version 1.6.[12345689]\n v=`svn_cmd --version | sed -n -e 's/^svn, version \\(1\\.[0-9]*\\.[0-9]*\\).*$/\\1/p'`\n case $v in\n-1.[45].*)\n+1.[456].*)\n \t;;\n *)\n \tsay \"skipping svn-info test (SVN version: $v not supported)\"\n@@ -166,7 +167,7 @@ test_expect_success 'info added-directory' \"\n \t\tgit add added-directory &&\n \tcd .. &&\n \t(cd svnwc; svn info added-directory) \\\n-\t\t> expected.info-added-directory &&\n+\t\t| grep -v \\\"Repository UUID\\\" > expected.info-added-directory &&\n \t(cd gitwc; git svn info added-directory) \\\n \t\t> actual.info-added-directory &&\n \ttest_cmp expected.info-added-directory actual.info-added-directory\n-- \n1.7.0.1.241.g6604f\n"},{"id":"136098","messageId":"cover.1267647872.git.git@drmicha.warpmail.net","threadId":"22894","inReplyTo":"d16ad252f24db9274bc9a5bcab959524eab823ed.1267636051.git.git@drmicha.warpmail.net","subject":"[PATCHv2 0/2] Make t9119-git-svn-info.sh run with svn 1.6.*","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-03-03T20:34:30Z","receivedAt":"2010-03-03T20:34:30Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"I'm sorry my previous analysis was wrong. In fact, since the delayed\nloading of SVN::Core, git-svn's cmd_info would guess the wrong svn version\nbecause it uses SVN::Core without loading it (leading to an empty version string).\n\nAfter fixing this, the test runs unmodified, so enbale it for 1.6.*.\n\nMichael J Gruber (2):\n git-svn: req_svn when needed\n t9119-git-svn-info.sh: test with svn 1.6.* as well\n\n git-svn.perl | 1 +\n t/t9119-git-svn-info.sh | 3 ++-\n 2 files changed, 3 insertions(+), 1 deletions(-)\n"},{"id":"136099","messageId":"53df75af0e7fa5a456b326652147840b07f0d53a.1267647872.git.git@drmicha.warpmail.net","threadId":"22894","inReplyTo":"d16ad252f24db9274bc9a5bcab959524eab823ed.1267636051.git.git@drmicha.warpmail.net","subject":"[PATCHv2 1/2] git-svn: req_svn when needed","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-03-03T20:34:31Z","receivedAt":"2010-03-03T20:34:31Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"The delayed loading of SVN missed a place where SVN::Core is used. Make\nsure to load the package before trying to use it.\n\nSigned-off-by: Michael J Gruber \n---\n git-svn.perl | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex b7c03b6..bae7231 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -1102,6 +1102,7 @@ sub cmd_info {\n \tif ($@) {\n \t\t$result .= \"Repository Root: (offline)\\n\";\n \t}\n+\t::_req_svn();\n \t$result .= \"Repository UUID: $uuid\\n\" unless $diff_status eq \"A\" &&\n \t\t($SVN::Core::VERSION le '1.5.4' || $file_type ne \"dir\");\n \t$result .= \"Revision: \" . ($diff_status eq \"A\" ? 0 : $rev) . \"\\n\";\n-- \n1.7.0.1.241.g6604f\n"},{"id":"136100","messageId":"934da657767ac16dc137f68783769505f6b082fb.1267647872.git.git@drmicha.warpmail.net","threadId":"22894","inReplyTo":"d16ad252f24db9274bc9a5bcab959524eab823ed.1267636051.git.git@drmicha.warpmail.net","subject":"[PATCHv2 2/2] t9119-git-svn-info.sh: test with svn 1.6.* as well","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-03-03T20:34:32Z","receivedAt":"2010-03-03T20:34:32Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"All tests in t9119 were disabled for subversion versions other than\n1.[45].*. Make the test script run with subversion 1.[456].*.\n\nSigned-off-by: Michael J Gruber \n---\n t/t9119-git-svn-info.sh | 3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh\nindex 95741cb..a9a558d 100755\n--- a/t/t9119-git-svn-info.sh\n+++ b/t/t9119-git-svn-info.sh\n@@ -7,9 +7,10 @@ test_description='git svn info'\n . ./lib-git-svn.sh\n \n # Tested with: svn, version 1.4.4 (r25188)\n+# Tested with: svn, version 1.6.[12345689]\n v=`svn_cmd --version | sed -n -e 's/^svn, version \\(1\\.[0-9]*\\.[0-9]*\\).*$/\\1/p'`\n case $v in\n-1.[45].*)\n+1.[456].*)\n \t;;\n *)\n \tsay \"skipping svn-info test (SVN version: $v not supported)\"\n-- \n1.7.0.1.241.g6604f\n"},{"id":"136142","messageId":"20100304094708.GA12885@dcvr.yhbt.net","threadId":"22894","inReplyTo":"cover.1267647872.git.git@drmicha.warpmail.net","subject":"Re: [PATCHv2 0/2] Make t9119-git-svn-info.sh run with svn 1.6.*","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-03-04T09:47:08Z","receivedAt":"2010-03-04T09:47:08Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Michael J Gruber wrote:\n> I'm sorry my previous analysis was wrong. In fact, since the delayed\n> loading of SVN::Core, git-svn's cmd_info would guess the wrong svn version\n> because it uses SVN::Core without loading it (leading to an empty version string).\n> \n> After fixing this, the test runs unmodified, so enbale it for 1.6.*.\n> \n> Michael J Gruber (2):\n> git-svn: req_svn when needed\n> t9119-git-svn-info.sh: test with svn 1.6.* as well\n> \n> git-svn.perl | 1 +\n> t/t9119-git-svn-info.sh | 3 ++-\n> 2 files changed, 3 insertions(+), 1 deletions(-)\n\nThanks Michael,\n\nAcked and pushed out to: git://git.bogomips.org/git-svn.git\n\n-- \nEric Wong\n"}]}