diff --git a/product/ERP5Subversion/SubversionClient.py b/product/ERP5Subversion/SubversionClient.py index f3ba0f9781e247fff22568d2f64d1320e89cb9fe..6cc9e40401c86389f6b97d7789f8392255fa2c25 100644 --- a/product/ERP5Subversion/SubversionClient.py +++ b/product/ERP5Subversion/SubversionClient.py @@ -227,7 +227,7 @@ try: raise error def export(self, src, dest): - return self.client.update(src_url_or_path=src, dest_path=dest) + return self.client.export(src_url_or_path=src, dest_path=dest) def update(self, path): try: diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py index f549d38999adb0fdce1085c9185eec1b3b601f32..a2c3ed087d218e086052110f41898696287ad99e 100644 --- a/product/ERP5Subversion/Tool/SubversionTool.py +++ b/product/ERP5Subversion/Tool/SubversionTool.py @@ -965,15 +965,7 @@ class SubversionTool(BaseTool, UniqueObject, Folder): self.activate().removeAllInList([path,]) def importBT(self, bt): - # Do svn export before importing to get rid of .svn stuff - # and unversioned files. - tmp_path = mktemp() + os.sep - self.export(self._getWorkingPath(self.getSubversionPath(bt)), tmp_path) - # Import - id = bt.download(tmp_path) - # Clean up - self.activate().removeAllInList([tmp_path,]) - return id + return bt.download(self._getWorkingPath(self.getSubversionPath(bt))) # Get a list of files and keep only parents # Necessary before recursively commit removals