Skip to content

Commit

Permalink
No longer svn & git-svn are used
Browse files Browse the repository at this point in the history
  • Loading branch information
nobu committed May 10, 2019
1 parent dbcc224 commit 9a4d39b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
10 changes: 1 addition & 9 deletions configure.ac
Expand Up @@ -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 \
Expand Down
7 changes: 1 addition & 6 deletions win32/Makefile.sub
Expand Up @@ -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)
Expand Down

0 comments on commit 9a4d39b

Please sign in to comment.