- do recursive svn revert before updating local working copy to avoid...

- do recursive svn revert before updating local working copy to avoid conflicts (reported by Romain)


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7516 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Subversion/Tool/SubversionTool.py

@@ -745,7 +745,9 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
     """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