{"thread":{"id":"32604","subject":"[PATCH v2 0/3] fixup remaining cvsimport tests","startedAt":"2013-01-12T06:21:40Z","lastAt":"2013-01-12T07:01:34Z","messageCount":6,"participants":["Chris Rorvick","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":3},"messages":[{"id":"206582","messageId":"1357971703-28513-1-git-send-email-chris@rorvick.com","threadId":"32604","inReplyTo":null,"subject":"[PATCH v2 0/3] fixup remaining cvsimport tests","fromName":"Chris Rorvick","fromEmail":"chris@rorvick.com","sentAt":"2013-01-12T06:21:40Z","receivedAt":"2013-01-12T06:21:40Z","isPatch":true,"sender":{"key":"chris@rorvick.com","avatar":"https://avatars.githubusercontent.com/u/824726?v=4"},"body":"Reroll w/ sign-off.\n\nChris Rorvick (3):\n t/lib-cvs.sh: allow cvsps version 3.x.\n t9600: fixup for new cvsimport\n t9604: fixup for new cvsimport\n\n t/lib-cvs.sh | 2 +-\n t/t9600-cvsimport.sh | 10 ++++------\n t/t9604-cvsimport-timestamps.sh | 5 ++---\n 3 files changed, 7 insertions(+), 10 deletions(-)\n\n-- \n1.8.1.rc3.335.g88a67d6\n"},{"id":"206585","messageId":"1357971703-28513-2-git-send-email-chris@rorvick.com","threadId":"32604","inReplyTo":"1357971703-28513-1-git-send-email-chris@rorvick.com","subject":"[PATCH v2 1/3] t/lib-cvs.sh: allow cvsps version 3.x.","fromName":"Chris Rorvick","fromEmail":"chris@rorvick.com","sentAt":"2013-01-12T06:21:41Z","receivedAt":"2013-01-12T06:21:41Z","isPatch":true,"sender":{"key":"chris@rorvick.com","avatar":"https://avatars.githubusercontent.com/u/824726?v=4"},"body":"Signed-off-by: Chris Rorvick \n---\n t/lib-cvs.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/lib-cvs.sh b/t/lib-cvs.sh\nindex 44263ad..b55e861 100644\n--- a/t/lib-cvs.sh\n+++ b/t/lib-cvs.sh\n@@ -15,7 +15,7 @@ export CVS\n \n cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`\n case \"$cvsps_version\" in\n-2.1 | 2.2*)\n+2.1 | 2.2* | 3.*)\n \t;;\n '')\n \tskip_all='skipping cvsimport tests, cvsps not found'\n-- \n1.8.1.rc3.335.g88a67d6\n"},{"id":"206583","messageId":"1357971703-28513-3-git-send-email-chris@rorvick.com","threadId":"32604","inReplyTo":"1357971703-28513-1-git-send-email-chris@rorvick.com","subject":"[PATCH v2 2/3] t9600: fixup for new cvsimport","fromName":"Chris Rorvick","fromEmail":"chris@rorvick.com","sentAt":"2013-01-12T06:21:42Z","receivedAt":"2013-01-12T06:21:42Z","isPatch":true,"sender":{"key":"chris@rorvick.com","avatar":"https://avatars.githubusercontent.com/u/824726?v=4"},"body":"cvsimport no longer supports -a (import all commits including recent ones)\nand no longer uses the 'origin' branch by default for imports.\n\nSigned-off-by: Chris Rorvick \n---\n t/t9600-cvsimport.sh | 10 ++++------\n 1 file changed, 4 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh\nindex 4c384ff..14f54d5 100755\n--- a/t/t9600-cvsimport.sh\n+++ b/t/t9600-cvsimport.sh\n@@ -44,7 +44,7 @@ EOF\n \n test_expect_success PERL 'import a trivial module' '\n \n-\tgit cvsimport -a -R -z 0 -C module-git module &&\n+\tgit cvsimport -R -z 0 -C module-git module &&\n \ttest_cmp module-cvs/o_fortuna module-git/o_fortuna\n \n '\n@@ -90,8 +90,7 @@ test_expect_success PERL 'update git module' '\n \n \t(cd module-git &&\n \tgit config cvsimport.trackRevisions true &&\n-\tgit cvsimport -a -z 0 module &&\n-\tgit merge origin\n+\tgit cvsimport -z 0 module\n \t) &&\n \ttest_cmp module-cvs/o_fortuna module-git/o_fortuna\n \n@@ -119,8 +118,7 @@ test_expect_success PERL 'cvsimport.module config works' '\n \t(cd module-git &&\n \t\tgit config cvsimport.module module &&\n \t\tgit config cvsimport.trackRevisions true &&\n-\t\tgit cvsimport -a -z0 &&\n-\t\tgit merge origin\n+\t\tgit cvsimport -z0\n \t) &&\n \ttest_cmp module-cvs/tick module-git/tick\n \n@@ -140,7 +138,7 @@ test_expect_success PERL 'import from a CVS working tree' '\n \t$CVS co -d import-from-wt module &&\n \t(cd import-from-wt &&\n \t\tgit config cvsimport.trackRevisions false &&\n-\t\tgit cvsimport -a -z0 &&\n+\t\tgit cvsimport -z0 &&\n \t\techo 1 >expect &&\n \t\tgit log -1 --pretty=format:%s%n >actual &&\n \t\ttest_cmp actual expect\n-- \n1.8.1.rc3.335.g88a67d6\n"},{"id":"206584","messageId":"1357971703-28513-4-git-send-email-chris@rorvick.com","threadId":"32604","inReplyTo":"1357971703-28513-1-git-send-email-chris@rorvick.com","subject":"[PATCH v2 3/3] t9604: fixup for new cvsimport","fromName":"Chris Rorvick","fromEmail":"chris@rorvick.com","sentAt":"2013-01-12T06:21:43Z","receivedAt":"2013-01-12T06:21:43Z","isPatch":true,"sender":{"key":"chris@rorvick.com","avatar":"https://avatars.githubusercontent.com/u/824726?v=4"},"body":"cvsps no longer writes a cache file and therefore no longer can be told\nto ignore it with -x.\n\nSigned-off-by: Chris Rorvick \n---\n t/t9604-cvsimport-timestamps.sh | 5 ++---\n 1 file changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t9604-cvsimport-timestamps.sh b/t/t9604-cvsimport-timestamps.sh\nindex 1fd5142..b1629b6 100755\n--- a/t/t9604-cvsimport-timestamps.sh\n+++ b/t/t9604-cvsimport-timestamps.sh\n@@ -7,8 +7,7 @@ setup_cvs_test_repository t9604\n \n test_expect_success 'check timestamps are UTC (TZ=CST6CDT)' '\n \n-\tTZ=CST6CDT git cvsimport -p\"-x\" -C module-1 module &&\n-\tgit cvsimport -p\"-x\" -C module-1 module &&\n+\tTZ=CST6CDT git cvsimport -C module-1 module &&\n \t(\n \t\tcd module-1 &&\n \t\tgit log --format=\"%s %ai\"\n@@ -42,7 +41,7 @@ test_expect_success 'check timestamps with author-specific timezones' '\n \tuser3=User Three EST5EDT\n \tuser4=User Four MST7MDT\n \tEOF\n-\tgit cvsimport -p\"-x\" -A cvs-authors -C module-2 module &&\n+\tgit cvsimport -A cvs-authors -C module-2 module &&\n \t(\n \t\tcd module-2 &&\n \t\tgit log --format=\"%s %ai %an\"\n-- \n1.8.1.rc3.335.g88a67d6\n"},{"id":"206586","messageId":"7vr4lq9acu.fsf@alter.siamese.dyndns.org","threadId":"32604","inReplyTo":"1357971703-28513-1-git-send-email-chris@rorvick.com","subject":"Re: [PATCH v2 0/3] fixup remaining cvsimport tests","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-01-12T06:36:01Z","receivedAt":"2013-01-12T06:36:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Chris Rorvick writes:\n\n> Reroll w/ sign-off.\n>\n> Chris Rorvick (3):\n> t/lib-cvs.sh: allow cvsps version 3.x.\n> t9600: fixup for new cvsimport\n> t9604: fixup for new cvsimport\n>\n> t/lib-cvs.sh | 2 +-\n> t/t9600-cvsimport.sh | 10 ++++------\n> t/t9604-cvsimport-timestamps.sh | 5 ++---\n> 3 files changed, 7 insertions(+), 10 deletions(-)\n\nThanks.\n\nI too noticed the droppage of \"-a\" support, which may not be a big\ndeal (people can drop it from their script, run cvsimport and they\ncan drop newer commits from the resulting Git history to emulate the\nold behaviour without \"-a\" that attempted to find a quiescent point\nif they really want to and suspect that the upstream CVS repository\nwas not quiescent during the import).\n\nLikewise for \"-x\". You said \"no longer can be told\" and that is\ntechnically true, but it is more like \"no longer need to be told, as\nstale cache cannot get in the way\", so it is probably not a big\ndeal, either, for people to drop it from their script.\n\nAbout the changed behaviour regarding \"origin\", I suspect that it is\na change for the better, but we would probably need documentation\nupdates to cover it (and deleted options and (mis)features) before\nthis topic graduates.\n"},{"id":"206587","messageId":"CAEUsAPYx3DtUg6sV0PRYjqY8Ss-dwGKoQX7Q7xNKBgGO_KvbeQ@mail.gmail.com","threadId":"32604","inReplyTo":"7vr4lq9acu.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH v2 0/3] fixup remaining cvsimport tests","fromName":"Chris Rorvick","fromEmail":"chris@rorvick.com","sentAt":"2013-01-12T07:01:34Z","receivedAt":"2013-01-12T07:01:34Z","isPatch":true,"sender":{"key":"chris@rorvick.com","avatar":"https://avatars.githubusercontent.com/u/824726?v=4"},"body":"On Sat, Jan 12, 2013 at 12:36 AM, Junio C Hamano wrote:\n> I too noticed the droppage of \"-a\" support, which may not be a big\n> deal (people can drop it from their script, run cvsimport and they\n> can drop newer commits from the resulting Git history to emulate the\n> old behaviour without \"-a\" that attempted to find a quiescent point\n> if they really want to and suspect that the upstream CVS repository\n> was not quiescent during the import).\n\nIs there any value to -a when fuzz is exposed (-z)? I mean this is a\nfunctional sense. I think there is a lot of value to maintaining the\ninterfaces of both cvsimport and cvsps where possible.\n\n> Likewise for \"-x\". You said \"no longer can be told\" and that is\n> technically true, but it is more like \"no longer need to be told, as\n> stale cache cannot get in the way\", so it is probably not a big\n> deal, either, for people to drop it from their script.\n\n:-) I originally wrote \"need\" and then changed it to be clearer on\nwhy it was being removed.\n"}]}