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

[nobody at svn.erp5.org]

Author: chris
Date: Tue Jul 18 16:37:30 2006
New Revision: 8495

URL: http://svn.erp5.org?rev=8495&view=rev
Log:
- switched two lines to remove unversioned files AFTER reverting local changes.

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=8495&r1=8494&r2=8495&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Tue Jul 18 16:37:30 2006
@@ -730,12 +730,12 @@
     """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
+    self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
     # Update from SVN
     client.update(path)
     # Import in zodb