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

[nobody at svn.erp5.org]

Author: chris
Date: Tue Jul 11 13:41:39 2006
New Revision: 8390

URL: http://svn.erp5.org?rev=8390&view=rev
Log:
- Don't revert changes before updating business template anymore. This way, we don't loose local changes when updating a BT.
- Removed "update local working copy" function because it made it too easy to revert changes committed by someone else without noticing

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=8390&r1=8389&r2=8390&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Tue Jul 11 13:41:39 2006
@@ -733,26 +733,10 @@
     # 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
     return self.importBT(business_template)
-  
-  security.declareProtected('Import/Export objects', 'updatewc')
-  def updatewc(self, business_template):
-    """Update a working copy.
-    """
-    path = self._getWorkingPath(self.getSubversionPath(business_template))
-    # First do recursive revert to avoid conflicts
-    self.revert(path, business_template, True)
-    # then 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)
 
   security.declareProtected('Import/Export objects', 'switch')
   def switch(self, business_template, url):