Commit a501d47f authored by Christophe Dumez's avatar Christophe Dumez

- remove unversionned files before update to avoid conflicts

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8497 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent aa008669
...@@ -730,11 +730,13 @@ class SubversionTool(BaseTool, UniqueObject, Folder): ...@@ -730,11 +730,13 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
"""Update a working copy. """Update a working copy.
""" """
path = self._getWorkingPath(self.getSubversionPath(business_template)) path = self._getWorkingPath(self.getSubversionPath(business_template))
# First remove unversioned in working copy that could conflict
self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
client = self._getClient() client = self._getClient()
# Revert local changes in working copy first # Revert local changes in working copy first
# to import a "pure" BT after update # to import a "pure" BT after update
self.revert(path=path, recurse=True) self.revert(path=path, recurse=True)
# First remove unversioned in working copy that could conflict # removed unversioned files due to former added files that were reverted
self.removeAllInList(x['uid'] for x in self.unversionedFiles(path)) self.removeAllInList(x['uid'] for x in self.unversionedFiles(path))
# Update from SVN # Update from SVN
client.update(path) client.update(path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment