usa	2014-10-15 15:58:02 +0900 (Wed, 15 Oct 2014)

  New Revision: 47931

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

  Log:
    merge revision(s) 47641,47642,47644: [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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h
    branches/ruby_2_0_0/win32/Makefile.sub
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 47930)
+++ ruby_2_0_0/ChangeLog	(revision 47931)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Oct 15 15:57:48 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 Oct 15 15:35:39 2014  Kazuki Tsujimoto  <kazuki@c...>
 
 	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
Index: ruby_2_0_0/win32/Makefile.sub
===================================================================
--- ruby_2_0_0/win32/Makefile.sub	(revision 47930)
+++ ruby_2_0_0/win32/Makefile.sub	(revision 47931)
@@ -371,6 +371,8 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTI https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/Makefile.sub#L371
 !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_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47930)
+++ ruby_2_0_0/version.h	(revision 47931)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-10-15"
-#define RUBY_PATCHLEVEL 578
+#define RUBY_PATCHLEVEL 579
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 10

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


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