eregon	2018-08-22 07:01:18 +0900 (Wed, 22 Aug 2018)

  New Revision: 64500

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64500

  Log:
    Update to ruby/mspec@269f9cd

  Removed files:
    trunk/spec/mspec/.travis.yml
  Modified files:
    trunk/spec/mspec/tool/sync/sync-rubyspec.rb
Index: spec/mspec/.travis.yml
===================================================================
--- spec/mspec/.travis.yml	(revision 64499)
+++ spec/mspec/.travis.yml	(nonexistent)
@@ -1,29 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/.travis.yml#L0
-sudo: false
-language: ruby
-script:
-  - bundle exec rspec
-matrix:
-  include:
-  - rvm: 2.3.7
-  - rvm: 2.4.4
-    before_install:
-      # https://github.com/travis-ci/travis-ci/issues/8978
-      - gem update --system
-      - gem install bundler
-  - rvm: 2.5.1
-    before_install:
-      # https://github.com/travis-ci/travis-ci/issues/8978
-      - gem update --system
-      - gem install bundler
-  - rvm: ruby-head
-    before_install:
-      # https://github.com/travis-ci/travis-ci/issues/8978
-      - gem update --system
-      - gem install bundler
-  - rvm: system
-    install:
-      - curl -L https://github.com/oracle/truffleruby/releases/download/vm-1.0.0-rc2/truffleruby-1.0.0-rc2-linux-amd64.tar.gz | tar xz
-      - export PATH="$PWD/truffleruby-1.0.0-rc2-linux-amd64/bin:$PATH"
-      - $PWD/truffleruby-1.0.0-rc2-linux-amd64/lib/truffle/post_install_hook.sh
-      - gem install bundler
-      - bundle install
Index: spec/mspec/tool/sync/sync-rubyspec.rb
===================================================================
--- spec/mspec/tool/sync/sync-rubyspec.rb	(revision 64499)
+++ spec/mspec/tool/sync/sync-rubyspec.rb	(revision 64500)
@@ -192,6 +192,7 @@ def fast_forward_master(impl) https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L192
   Dir.chdir(SOURCE_REPO) do
     sh "git", "checkout", "master"
     sh "git", "merge", "--ff-only", "#{impl.name}-rebased"
+    sh "git", "branch", "--delete", "#{impl.name}-rebased"
   end
 end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/