Fix SVN.update
authorRalf Jung <post@ralfj.de>
Mon, 11 Feb 2013 12:41:28 +0000 (13:41 +0100)
committerRalf Jung <post@ralfj.de>
Mon, 11 Feb 2013 12:41:28 +0000 (13:41 +0100)
vcs.py

diff --git a/vcs.py b/vcs.py
index 02a919223157157f3bf655c0bf76da6d9128532e..3e04f465cd937a689a42fd802b0cd222c9e34c9b 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -110,10 +110,11 @@ class SVN:
                self.folder = os.path.abspath(folder)
                self.url = url
 
                self.folder = os.path.abspath(folder)
                self.url = url
 
-       def update(self, forceVersion=False):
+       def update(self, mode = MODE_REBASE):
+               if mode == MODE_FETCH: raise Exception("Just fetching is not supported with SVN")
                if os.path.exists(self.folder):
                        os.chdir(self.folder) # go into repository
                if os.path.exists(self.folder):
                        os.chdir(self.folder) # go into repository
-                       if forceVersion: subprocess.check_call(['svn', 'revert', '-R', '.'])
+                       if mode == MODE_RESET: subprocess.check_call(['svn', 'revert', '-R', '.'])
                        subprocess.check_call(['svn', 'switch', self.url]) # and update to the URL we got
                else:
                        os.makedirs(self.folder) # if even the parent folder does not exist, svn fails
                        subprocess.check_call(['svn', 'switch', self.url]) # and update to the URL we got
                else:
                        os.makedirs(self.folder) # if even the parent folder does not exist, svn fails