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

[nobody at svn.erp5.org]

Author: chris
Date: Tue Jul 18 15:34:45 2006
New Revision: 8487

URL: http://svn.erp5.org?rev=8487&view=rev
Log:
- revert changes before updating bt

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=8487&r1=8486&r2=8487&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Tue Jul 18 15:34:45 2006
@@ -733,6 +733,9 @@
     # 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)
     # Update from SVN
     client.update(path)
     # Import in zodb