diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py index ac4d28db682e4652076aeb574e533b7abe287fe0..9d3ab4f2d8db3325de1b805c10efbd2c08a89488 100644 --- a/product/ERP5Subversion/Tool/SubversionTool.py +++ b/product/ERP5Subversion/Tool/SubversionTool.py @@ -733,6 +733,9 @@ class SubversionTool(BaseTool, UniqueObject, Folder): # 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