Force Subversion to overwrite files

diff --git a/build.py b/build.py
index 23bf9da5574ff0dfd4f2b82533ff9a8c2c6be17c..5c0fe6a9c8069ff44376b2e657f7fa1cee537857 100755 (executable)
--- 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: