From: Henrik Tunedal <tunedal@gmail.com>
Date: Fri, 1 Apr 2011 21:36:29 +0000 (+0200)
Subject: Force Subversion to overwrite files
X-Git-Tag: 0.1~1423
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=347ee22ca35ebac08c7f8ed2cb8cdfe037a28dc2;p=fdroidserver.git

Force Subversion to overwrite files
---

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: