From 4104741383e1f9ca15dd941520525ffce5d846ac Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 24 Oct 2011 11:29:38 +0000 Subject: [PATCH] Merged r7643 from trunk scm: mercurial: skip failing unit model tests on below Mercurial 1.5 Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7647 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/repository_mercurial_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb index 6b79f7655..4584b1e0b 100644 --- a/test/unit/repository_mercurial_test.rb +++ b/test/unit/repository_mercurial_test.rb @@ -158,8 +158,10 @@ class RepositoryMercurialTest < ActiveSupport::TestCase assert_equal %w|4 3|, changesets.collect(&:revision) # named branch - changesets = @repository.latest_changesets('', @branch_char_1) - assert_equal %w|27 26|, changesets.collect(&:revision) + if @repository.scm.class.client_version_above?([1, 6]) + changesets = @repository.latest_changesets('', @branch_char_1) + assert_equal %w|27 26|, changesets.collect(&:revision) + end changesets = @repository.latest_changesets("latin-1-dir/test-#{@char_1}-subdir", @branch_char_1) assert_equal %w|27|, changesets.collect(&:revision)