nagachika	2014-09-24 02:22:03 +0900 (Wed, 24 Sep 2014)

  New Revision: 47702

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

  Log:
    merge revision(s) r47641,r47642,r47644: [Backport #10262]
    
    * win32/win32.c (VCSUP): nothing to do if this worktree is not under
      any VCS (it means that the worktree may be from the release package).
    
    * win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
      under any VCS (it means that the worktree may be from the release
      package).

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/version.h
    branches/ruby_2_1/win32/Makefile.sub
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 47701)
+++ ruby_2_1/ChangeLog	(revision 47702)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Sep 24 02:21:41 2014  NAKAMURA Usaku  <usa@r...>
+
+	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
+	  under any VCS (it means that the worktree may be from the release
+	  package).
+
 Wed Sep 24 02:06:33 2014  Tanaka Akira  <akr@f...>
 
 	* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
Index: ruby_2_1/win32/Makefile.sub
===================================================================
--- ruby_2_1/win32/Makefile.sub	(revision 47701)
+++ ruby_2_1/win32/Makefile.sub	(revision 47702)
@@ -377,6 +377,8 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTI https://github.com/ruby/ruby/blob/trunk/ruby_2_1/win32/Makefile.sub#L377
 !else if exist($(srcdir)/.git)
 VCS = git
 VCSUP = $(VCS) pull $(GITPULLOPTIONS)
+!else
+VCSUP = rem
 !endif
 ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 47701)
+++ ruby_2_1/version.h	(revision 47702)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.4"
 #define RUBY_RELEASE_DATE "2014-09-24"
-#define RUBY_PATCHLEVEL 245
+#define RUBY_PATCHLEVEL 246
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47641-47642,47644


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