diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 06:58:02 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-15 06:58:02 +0000 |
| commit | a7679182e585e33cc98134d612f2999a67772e95 (patch) | |
| tree | ad0d003db02daaf29c588d1bfc8f788e106a5e7f | |
| parent | 172cc121b9d8308306167515cf97df48cbac637a (diff) | |
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).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Oct 15 15:57:48 2014 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@callcc.net> * ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve @@ -1,6 +1,6 @@ #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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 5c5a241102..38218cdbe9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -371,6 +371,8 @@ VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS) !else if exist($(srcdir)/.git) VCS = git VCSUP = $(VCS) pull $(GITPULLOPTIONS) +!else +VCSUP = rem !endif ruby_pc = $(RUBY_BASE_NAME)-$(MAJOR).$(MINOR).pc |