Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxx> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxx> ? > 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 && > -- -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html