git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
To: GIT Mailing-list <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	stevenrwalter@gmail.com, normalperson@yhbt.net
Subject: [RFC/PATCH] t9157-*.sh: Add an svn version check
Date: Thu, 06 Jan 2011 18:29:23 +0000	[thread overview]
Message-ID: <4D260A03.90903@ramsay1.demon.co.uk> (raw)


Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

This test fails for me, because my svn version(s) are too old (1.4.3 and 1.4.6), and
so I've got into the habit of running the tests with NO_SVN_TESTS=1. (which is a bit
of a shame in terms of test coverage, but it is *much* quicker!)

I don't know the details, but it seems that the 'svn merge' of this vintage does not
support the operations required by this test. Unfortunately, I don't know what the
minimum required version of svn is, so I'm hoping that someone can take this patch
and fix it up properly ...

ATB,
Ramsay Jones

 t/t9157-git-svn-fetch-merge.sh |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/t/t9157-git-svn-fetch-merge.sh b/t/t9157-git-svn-fetch-merge.sh
index da582c5..accf61e 100755
--- a/t/t9157-git-svn-fetch-merge.sh
+++ b/t/t9157-git-svn-fetch-merge.sh
@@ -6,6 +6,14 @@
 test_description='git svn merge detection'
 . ./lib-git-svn.sh
 
+svn_ver="$(svn --version --quiet)"
+case $svn_ver in
+[0-1].[0-4].[0-6])
+	skip_all="skipping git-svn test - SVN too old ($svn_ver)"
+	test_done
+	;;
+esac
+
 test_expect_success 'initialize source svn repo' '
 	svn_cmd mkdir -m x "$svnrepo"/trunk &&
 	svn_cmd mkdir -m x "$svnrepo"/branches &&
-- 
1.7.3

             reply	other threads:[~2011-01-06 18:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-06 18:29 Ramsay Jones [this message]
2011-01-07 17:31 ` [RFC/PATCH] t9157-*.sh: Add an svn version check Eric Wong
2011-01-07 17:44   ` Steven Walter
2011-01-07 18:02     ` Eric Wong
2011-01-07 18:19       ` Jonathan Nieder
2011-01-07 18:39         ` Eric Wong
2011-01-07 22:22     ` Eric Wong
2011-01-07 22:32       ` Junio C Hamano
2011-01-08  9:19 ` Anders Kaseorg
2011-01-11 18:21   ` Ramsay Jones

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=4D260A03.90903@ramsay1.demon.co.uk \
    --to=ramsay@ramsay1.demon.co.uk \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=normalperson@yhbt.net \
    --cc=stevenrwalter@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.
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 NNTP newsgroup(s).