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

[nobody at svn.erp5.org]

Author: chris
Date: Mon May 29 11:00:34 2006
New Revision: 7516

URL: http://svn.erp5.org?rev=7516&view=rev
Log:
- do recursive svn revert before updating local working copy to avoid conflicts (reported by Romain)

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=7516&r1=7515&r2=7516&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Mon May 29 11:00:34 2006
@@ -745,7 +745,9 @@
     """Update a working copy.
     """
     path = self._getWorkingPath(self.getSubversionPath(business_template))
-    # First remove unversioned in working copy that could conflict
+    # 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