{"thread":{"id":"34446","subject":"[PATCH] t9200 - Allow cvs version 1.12","startedAt":"2013-07-15T20:36:25Z","lastAt":"2013-07-16T02:05:03Z","messageCount":3,"participants":["Mark Levedahl","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"223482","messageId":"1373920585-22370-1-git-send-email-mlevedahl@gmail.com","threadId":"34446","inReplyTo":null,"subject":"[PATCH] t9200 - Allow cvs version 1.12","fromName":"Mark Levedahl","fromEmail":"mlevedahl@gmail.com","sentAt":"2013-07-15T20:36:25Z","receivedAt":"2013-07-15T20:36:25Z","isPatch":true,"sender":{"key":"mdl123@verizon.net","avatar":"https://avatars.githubusercontent.com/u/5302462?v=4"},"body":"cvs v1.12 does not correctly handle \"cvs co -d $DIR\", which is shorthand\nfor \"mkdir $DIR, cd $DIR, cvs co, cd -\". So, use the latter form.\n\nAlso cvs v1.12 does not necessarily match cvs v1.11 in the format of\nCVS/Entries, and this causes a false failure in subtest 14. Eliminate\nchecking CVS/Entries for this one test, but keep the test that the\ncreated file exists and is checked out.\n\nWith these changes, all tests in t9200 pass on Cygwin using its default\ncvs version 1.12.\n\nSigned-off-by: Mark Levedahl <mlevedahl@gmail.com>\n---\n t/t9200-git-cvsexportcommit.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh\nindex 3fb3368..17cb554 100755\n--- a/t/t9200-git-cvsexportcommit.sh\n+++ b/t/t9200-git-cvsexportcommit.sh\n@@ -28,7 +28,8 @@ rm -rf \"$CVSROOT\" \"$CVSWORK\"\n \n cvs init &&\n test -d \"$CVSROOT\" &&\n-cvs -Q co -d \"$CVSWORK\" . &&\n+mkdir -p \"$CVSWORK\" &&\n+(cd \"$CVSWORK\" && cvs -Q co .) &&\n echo >empty &&\n git add empty &&\n git commit -q -a -m \"Initial\" 2>/dev/null ||\n@@ -313,7 +314,6 @@ test_expect_success 'commit a file with leading spaces in the name' '\n \tgit commit -m \"Add a file with a leading space\" &&\n \tid=$(git rev-parse HEAD) &&\n \tgit cvsexportcommit -w \"$CVSWORK\" -c $id &&\n-\tcheck_entries \"$CVSWORK\" \" space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/\" &&\n \ttest_cmp \"$CVSWORK/ space\" \" space\"\n \n '\n-- \n1.8.3.2.0.63\n"},{"id":"223490","messageId":"7v1u6za379.fsf@alter.siamese.dyndns.org","threadId":"34446","inReplyTo":"1373920585-22370-1-git-send-email-mlevedahl@gmail.com","subject":"Re: [PATCH] t9200 - Allow cvs version 1.12","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-07-15T22:06:02Z","receivedAt":"2013-07-15T22:06:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Mark Levedahl <mlevedahl@gmail.com> writes:\n\n> cvs v1.12 does not correctly handle \"cvs co -d $DIR\", which is shorthand\n> for \"mkdir $DIR, cd $DIR, cvs co, cd -\". So, use the latter form.\n\nHmph, I think I've been using 1.12.13 and without seeing such a\nbreakage.  Do you mean \"exactly v1.12\", not \"v1.12.x series\"?\n\n> Also cvs v1.12 does not necessarily match cvs v1.11 in the format of\n> CVS/Entries, and this causes a false failure in subtest 14. Eliminate\n> checking CVS/Entries for this one test, but keep the test that the\n> created file exists and is checked out.\n\nAlso I suspect this is not because we are expecting v1.11 format, as\nv1.12.13 on my box seems to pass the test.  While your removal of\nthe \"check_entries\" step might be a valid workaround for whatever\nversion is shipped with Cygwin, the above problem description seems\nsomewhat inaccurate.\n\n> With these changes, all tests in t9200 pass on Cygwin using its default\n> cvs version 1.12.\n>\n> Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>\n> ---\n>  t/t9200-git-cvsexportcommit.sh | 4 ++--\n>  1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh\n> index 3fb3368..17cb554 100755\n> --- a/t/t9200-git-cvsexportcommit.sh\n> +++ b/t/t9200-git-cvsexportcommit.sh\n> @@ -28,7 +28,8 @@ rm -rf \"$CVSROOT\" \"$CVSWORK\"\n>  \n>  cvs init &&\n>  test -d \"$CVSROOT\" &&\n> -cvs -Q co -d \"$CVSWORK\" . &&\n> +mkdir -p \"$CVSWORK\" &&\n> +(cd \"$CVSWORK\" && cvs -Q co .) &&\n>  echo >empty &&\n>  git add empty &&\n>  git commit -q -a -m \"Initial\" 2>/dev/null ||\n> @@ -313,7 +314,6 @@ test_expect_success 'commit a file with leading spaces in the name' '\n>  \tgit commit -m \"Add a file with a leading space\" &&\n>  \tid=$(git rev-parse HEAD) &&\n>  \tgit cvsexportcommit -w \"$CVSWORK\" -c $id &&\n> -\tcheck_entries \"$CVSWORK\" \" space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/\" &&\n>  \ttest_cmp \"$CVSWORK/ space\" \" space\"\n>  \n>  '\n"},{"id":"223494","messageId":"51E4AA4F.6090008@gmail.com","threadId":"34446","inReplyTo":"7v1u6za379.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] t9200 - Allow cvs version 1.12","fromName":"Mark Levedahl","fromEmail":"mlevedahl@gmail.com","sentAt":"2013-07-16T02:05:03Z","receivedAt":"2013-07-16T02:05:03Z","isPatch":true,"sender":{"key":"mdl123@verizon.net","avatar":"https://avatars.githubusercontent.com/u/5302462?v=4"},"body":"On 07/15/2013 06:06 PM, Junio C Hamano wrote:\n> Mark Levedahl <mlevedahl@gmail.com> writes:\n>\n>> cvs v1.12 does not correctly handle \"cvs co -d $DIR\", which is shorthand\n>> for \"mkdir $DIR, cd $DIR, cvs co, cd -\". So, use the latter form.\n> Hmph, I think I've been using 1.12.13 and without seeing such a\n> breakage.  Do you mean \"exactly v1.12\", not \"v1.12.x series\"?\n>\nHmm, good instincts. Cygwin includes 1.12.13 which is what I used. I \ndownloaded the sources, rebuilt, everything works fine, so apparently \nthe Cygwin provided cvs binary is corrupt. I apologize for the noise, \nwill take this to the Cygwin list.\n\nMark\n"}]}