From: Eric Wong <normalperson@yhbt.net>
To: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Cc: Sam Vilain <sam@vilain.net>,
Michael J Gruber <git@drmicha.warpmail.net>,
Junio C Hamano <gitster@pobox.com>,
GIT Mailing-list <git@vger.kernel.org>,
mhagger@alum.mit.edu
Subject: Re: [RFC/PATCH] t9159-*.sh: Don't use the svn '@<rev>' syntax
Date: Tue, 13 Sep 2011 07:57:26 +0000 [thread overview]
Message-ID: <20110913075726.GA15066@dcvr.yhbt.net> (raw)
In-Reply-To: <4E6BA0FA.9070103@ramsay1.demon.co.uk>
Ramsay Jones <ramsay@ramsay1.demon.co.uk> wrote:
> Hmm, I was hoping that someone would say something like:
>
> "This test does not depend on the difference between the peg revision
> and the operative revision, because the history represented in the test
> repo is so simple that there *is* no difference, so Acked By: ... "
Unfortunately, I remain perpetually confused w.r.t peg revisions vs "-r"
and how it's handled differently between different SVN versions.
> But, since that didn't happen, maybe the patch given below would be more
> acceptable? (I personally prefer the original patch ...)
I'm much more comfortable with your below patch as it won't break
on newer (and increasingly more widely-used) versions.
> Given that I didn't quite follow Sam's explanation, I still don't know
> if t9104-git-svn-follow-parent.sh needs to be changed (again, this test
> *passes* for me), so ... :-P
> Subject: [PATCH] t9159-*.sh: Add an svn version check
How about something along the lines of:
Subject: [PATCH] t9159-*.sh: skip for mergeinfo test for svn <= 1.4
t9159 relies on the command-line syntax of svn >= 1.5.
Given the declining install base of older svn versions,
it is not worth our time to support older svn syntax.
Acked-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
?
> diff --git a/t/t9159-git-svn-no-parent-mergeinfo.sh b/t/t9159-git-svn-no-parent-mergeinfo.sh
> index 85120b7..69e4815 100755
> --- a/t/t9159-git-svn-no-parent-mergeinfo.sh
> +++ b/t/t9159-git-svn-no-parent-mergeinfo.sh
> @@ -2,6 +2,14 @@
> test_description='git svn handling of root commits in merge ranges'
> . ./lib-git-svn.sh
>
> +svn_ver="$(svn --version --quiet)"
> +case $svn_ver in
> +0.* | 1.[0-4].*)
> + skip_all="skipping git-svn test - SVN too old ($svn_ver)"
> + test_done
> + ;;
> +esac
> +
> test_expect_success 'test handling of root commits in merge ranges' '
> mkdir -p init/trunk init/branches init/tags &&
> echo "r1" > init/trunk/file.txt &&
> --
next prev parent reply other threads:[~2011-09-13 7:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 18:04 [RFC/PATCH] t9159-*.sh: Don't use the svn '@<rev>' syntax Ramsay Jones
2011-07-19 19:58 ` Junio C Hamano
2011-07-20 9:07 ` Michael J Gruber
2011-07-20 16:59 ` Sam Vilain
2011-09-10 17:40 ` Ramsay Jones
2011-09-13 7:57 ` Eric Wong [this message]
2011-09-13 9:15 ` John Szakmeister
2011-09-13 17:14 ` Junio C Hamano
2011-07-20 9:10 ` Michael J Gruber
2011-07-20 13:29 ` Michael J Gruber
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110913075726.GA15066@dcvr.yhbt.net \
--to=normalperson@yhbt.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=ramsay@ramsay1.demon.co.uk \
--cc=sam@vilain.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.