Can't force checkouts if using Leopard system SVN

This commit is contained in:
Charlie Sharpsteen 2012-04-22 10:46:30 -07:00
parent d33f60815c
commit 4b96cf6f0b

View File

@ -257,7 +257,9 @@ class SubversionDownloadStrategy < AbstractDownloadStrategy
# This saves on bandwidth and will have a similar effect to verifying the # This saves on bandwidth and will have a similar effect to verifying the
# cache as it will make any changes to get the right revision. # cache as it will make any changes to get the right revision.
svncommand = target.exist? ? 'up' : 'checkout' svncommand = target.exist? ? 'up' : 'checkout'
args = [svn, svncommand, '--force'] args = [svn, svncommand]
# SVN shipped with XCode 3.1.4 can't force a checkout.
args << '--force' unless MacOS.leopard? and svn == '/usr/bin/svn'
args << url if !target.exist? args << url if !target.exist?
args << target args << target
args << '-r' << revision if revision args << '-r' << revision if revision