diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-23 17:22:03 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-23 17:22:03 +0000 |
| commit | 514b5e8d6ffd1957c71d659d9763dc600b4cb6d6 (patch) | |
| tree | ccb68c697219ca95cbb700afca4199c47f282d0b | |
| parent | 57fd50137177d0eb08d6acc48b460eaf87df746d (diff) | |
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).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47702 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 Sep 24 02:21:41 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 Sep 24 02:06:33 2014 Tanaka Akira <akr@fsij.org> * test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g. @@ -1,6 +1,6 @@ #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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d6289bc53d..e393b46253 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -377,6 +377,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 |