- remove unversioned files before updating local working copy (to avoid conflicts)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7418 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Subversion/SubversionClient.py

@@ -294,7 +294,7 @@ try:
       return log_list
         
     def add(self, path):
-      return self.client.add(path=path, force=True)
+      self.client.add(path=path, force=True)
 
     def resolved(self, path):
       return self.client.resolved(path=path)
@@ -339,7 +339,7 @@ try:
       return self.client.cleanup(path=path)
 
     def remove(self, path):
-      return self.client.remove(url_or_path=path, force=True)
+      self.client.remove(url_or_path=path, force=True)
 
   def newSubversionClient(container, **kw):
     return SubversionClient(container, **kw).__of__(container)

product/ERP5Subversion/Tool/SubversionTool.py

@@ -727,6 +727,8 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
     """Update a working copy.
     """
     path = self._getWorkingPath(self.getSubversionPath(business_template))
+    # First remove unversioned in working copy that could conflict
+    self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
     client = self._getClient()
     # Revert local changes in working copy first 
     # to import a "pure" BT after update
@@ -741,6 +743,8 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
     """Update a working copy.
     """
     path = self._getWorkingPath(self.getSubversionPath(business_template))
+    # First remove unversioned in working copy that could conflict
+    self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
     client = self._getClient()
     # Update from SVN
     client.update(path)