зеркало из https://github.com/github/ruby.git
No longer svn & git-svn are used
This commit is contained in:
Родитель
dbcc224f38
Коммит
9a4d39b95e
10
configure.ac
10
configure.ac
|
@ -3908,20 +3908,12 @@ AC_CONFIG_FILES(Makefile, [
|
|||
{
|
||||
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 \
|
||||
|
|
|
@ -495,12 +495,7 @@ HAVE_GIT = no
|
|||
! 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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче