From: Junio C Hamano <gitster@pobox.com>
To: Mark Levedahl <mlevedahl@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] t9200 - Allow cvs version 1.12
Date: Mon, 15 Jul 2013 15:06:02 -0700 [thread overview]
Message-ID: <7v1u6za379.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1373920585-22370-1-git-send-email-mlevedahl@gmail.com> (Mark Levedahl's message of "Mon, 15 Jul 2013 16:36:25 -0400")
Mark Levedahl <mlevedahl@gmail.com> writes:
> cvs v1.12 does not correctly handle "cvs co -d $DIR", which is shorthand
> for "mkdir $DIR, cd $DIR, cvs co, cd -". So, use the latter form.
Hmph, I think I've been using 1.12.13 and without seeing such a
breakage. Do you mean "exactly v1.12", not "v1.12.x series"?
> Also cvs v1.12 does not necessarily match cvs v1.11 in the format of
> CVS/Entries, and this causes a false failure in subtest 14. Eliminate
> checking CVS/Entries for this one test, but keep the test that the
> created file exists and is checked out.
Also I suspect this is not because we are expecting v1.11 format, as
v1.12.13 on my box seems to pass the test. While your removal of
the "check_entries" step might be a valid workaround for whatever
version is shipped with Cygwin, the above problem description seems
somewhat inaccurate.
> With these changes, all tests in t9200 pass on Cygwin using its default
> cvs version 1.12.
>
> Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
> ---
> t/t9200-git-cvsexportcommit.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
> index 3fb3368..17cb554 100755
> --- a/t/t9200-git-cvsexportcommit.sh
> +++ b/t/t9200-git-cvsexportcommit.sh
> @@ -28,7 +28,8 @@ rm -rf "$CVSROOT" "$CVSWORK"
>
> cvs init &&
> test -d "$CVSROOT" &&
> -cvs -Q co -d "$CVSWORK" . &&
> +mkdir -p "$CVSWORK" &&
> +(cd "$CVSWORK" && cvs -Q co .) &&
> echo >empty &&
> git add empty &&
> git commit -q -a -m "Initial" 2>/dev/null ||
> @@ -313,7 +314,6 @@ test_expect_success 'commit a file with leading spaces in the name' '
> git commit -m "Add a file with a leading space" &&
> id=$(git rev-parse HEAD) &&
> git cvsexportcommit -w "$CVSWORK" -c $id &&
> - check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" &&
> test_cmp "$CVSWORK/ space" " space"
>
> '
next prev parent reply other threads:[~2013-07-15 22:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 20:36 [PATCH] t9200 - Allow cvs version 1.12 Mark Levedahl
2013-07-15 22:06 ` Junio C Hamano [this message]
2013-07-16 2:05 ` Mark Levedahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1u6za379.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mlevedahl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).