ruby-changes:55699
From: Nobuyoshi <ko1@a...>
Date: Fri, 10 May 2019 16:38:34 +0900 (JST)
Subject: [ruby-changes:55699] Nobuyoshi Nakada: 9a4d39b95e (trunk): No longer svn & git-svn are used
https://git.ruby-lang.org/ruby.git/commit/?id=9a4d39b95e From 9a4d39b95ed60a00aec2ee3447931015254eb794 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Fri, 10 May 2019 15:22:54 +0900 Subject: No longer svn & git-svn are used diff --git a/configure.ac b/configure.ac index 9997ee2..d068efd 100644 --- a/configure.ac +++ b/configure.ac @@ -3908,20 +3908,12 @@ AC_CONFIG_FILES(Makefile, [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3908 { AS_IF([test ${VCS+set}], [ : - ], [svn info "$srcdir" > /dev/null 2>&1], [ - VCS='svn' ], [git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`], [ - AS_IF([test -d "$git_dir/svn"], [ - VCS='$(GIT) svn' - ], [ - VCS='$(GIT)' - ]) + VCS='$(GIT)' ], [ VCS='echo cannot' ]) AS_CASE("$VCS", - [svn], [VCSUP='$(VCS) up $(SVNUPOPTIONS)'], - ['$(GIT) svn'], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'], ['$(GIT)'|git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'], [VCSUP='$(VCS)']) sed -n \ diff --git a/win32/Makefile.sub b/win32/Makefile.sub index ff1a865..756ee7a 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -495,12 +495,7 @@ HAVE_GIT = no https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L495 ! endif !endif -!if exist($(srcdir)/.svn) -VCS = svn -VCSUP = $(VCS) up $(SVNUPOPTIONS) -!else if exist($(srcdir)/.git/svn) -VCS = $(GIT) svn -VCSUP = $(VCS) rebase $(GITSVNREBASEOPTIONS) +!if defined(VCS) !else if exist($(srcdir)/.git) VCS = $(GIT) VCSUP = $(VCS) pull $(GITPULLOPTIONS) -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/