[Erp5-report] r8497 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

[nobody at svn.erp5.org]

Author: chris
Date: Tue Jul 18 16:48:08 2006
New Revision: 8497

URL: http://svn.erp5.org?rev=8497&view=rev
Log:
- remove unversionned files before update to avoid conflicts

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

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=8497&r1=8496&r2=8497&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Tue Jul 18 16:48:08 2006
@@ -730,11 +730,13 @@
     """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
     self.revert(path=path, recurse=True)
-     # First remove unversioned in working copy that could conflict
+    # removed unversioned files due to former added files that were reverted
     self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
     # Update from SVN
     client.update(path)