diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml index be2d263fb96ca928be8a51f2dda9636da4d1876a..85064deaf84d5a26a00cf442f71fd0d77c9c258c 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml @@ -79,8 +79,9 @@ if changelog is None or not changelog.strip():\n error_msg = "Please set a ChangeLog message."\n else:\n portal_subversion = context.getPortalObject().portal_subversion\n + exclude_list = added.split(\',\') + modified.split(\',\') + removed.split(\',\')\n portal_subversion.revert(\'.\', business_template=context, recurse=True,\n - exclude_list = added.split(\',\') + modified.split(\',\') + removed.split(\',\'))\n + exclude_list=filter(None, exclude_list))\n try:\n revision = portal_subversion.checkin(\'.\', business_template=context,\n log_message=changelog)\n @@ -164,7 +165,9 @@ return context.asContext(added=added, modified=modified, removed=removed,\n <string>error_msg</string> <string>context</string> <string>portal_subversion</string> + <string>exclude_list</string> <string>True</string> + <string>filter</string> <string>revision</string> <string>e</string> <string>dict</string> diff --git a/bt5/erp5_forge/bt/revision b/bt5/erp5_forge/bt/revision index 0da6a13444c378ceacbbb43fa35176ab61f1f41a..4793663f9f2f7cbe691c9358f8781ea33ef7fcf4 100644 --- a/bt5/erp5_forge/bt/revision +++ b/bt5/erp5_forge/bt/revision @@ -1 +1 @@ -630 \ No newline at end of file +631 \ No newline at end of file diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py index 2d9a26ddccae11a8541e709d085150eb70237274..b086e54f05a571c1ff06883e26275d621edebd70 100644 --- a/product/ERP5Subversion/Tool/SubversionTool.py +++ b/product/ERP5Subversion/Tool/SubversionTool.py @@ -610,7 +610,7 @@ class SubversionTool(BaseTool): """ client = self._getClient() if isinstance(path, basestring): - path = path, + path = [path] if business_template is not None: path = [self._getWorkingPath(self.relativeToAbsolute(x, business_template)) for x in path]