Project

General

Profile

« Previous | Next » 

Revision 12405

bugfix: lib/common.Makefile: `svn add`: need to run with --force because the new version of svn in the latest Mac upgrade errors if the file is already under version control

View differences:

trunk/lib/common.Makefile
68 68

  
69 69
## SVN
70 70

  
71
addFile = $(if $(wildcard $(1)),,touch $(1) && )svn add $(1)
72
addDir = $(if $(wildcard $(1)/),svn add --depth=empty $(1),svn mkdir $(1))
73
add* = $(if $(1),svn add --depth=empty $(1))
71
addFile = $(if $(wildcard $(1)),,touch $(1) && )svn add --force $(1)
72
addDir = $(if $(wildcard $(1)/),svn add --force --depth=empty $(1),svn mkdir $(1))
73
add* = $(if $(1),svn add --force --depth=empty $(1))
74 74

  
75 75
# Revisions
76 76
revision = $(shell svn info $(1)|$(sed) -n 's/^Last Changed Rev: (.*)$$/\1/p')

Also available in: Unified diff