From 347ee22ca35ebac08c7f8ed2cb8cdfe037a28dc2 Mon Sep 17 00:00:00 2001 From: Henrik Tunedal Date: Fri, 1 Apr 2011 23:36:29 +0200 Subject: [PATCH] Force Subversion to overwrite files --- build.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index 23bf9da5..5c0fe6a9 100755 --- a/build.py +++ b/build.py @@ -162,10 +162,12 @@ for app in apps: print "Git reset failed" sys.exit(1) elif app['repotype'] == 'svn': - if subprocess.call(['svn', 'update', '-r', thisbuild['commit']], - cwd=build_dir) != 0: - print "Svn update failed" - sys.exit(1) + for svncommand in (['svn', 'update', '--force', + '-r', thisbuild['commit']], + ['svn', 'revert', '-R', '.']): + if subprocess.call(svncommand, cwd=build_dir) != 0: + print "Svn update failed" + sys.exit(1) elif app['repotype'] == 'hg': if subprocess.call(['hg', 'checkout', thisbuild['commit']], cwd=build_dir) != 0: -- 2.30.2