[Erp5-report] r7418 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/

[nobody at svn.erp5.org]

Author: chris
Date: Mon May 22 18:28:17 2006
New Revision: 7418

URL: http://svn.erp5.org?rev=7418&view=rev
Log:
- remove unversioned files before updating local working copy (to avoid conflicts)

Modified:
    erp5/trunk/products/ERP5Subversion/SubversionClient.py
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/SubversionClient.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/SubversionClient.py?rev=7418&r1=7417&r2=7418&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Mon May 22 18:28:17 2006
@@ -294,7 +294,7 @@
       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 @@
       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)

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=7418&r1=7417&r2=7418&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Mon May 22 18:28:17 2006
@@ -727,6 +727,8 @@
     """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 @@
     """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)