From dc3036f9836ba7b0f3211d69133f5242908db847 Mon Sep 17 00:00:00 2001 From: Christophe Dumez <christophe@nexedi.com> Date: Mon, 29 May 2006 09:00:34 +0000 Subject: [PATCH] - 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py index 974d468712..a5084cb121 100644 --- a/product/ERP5Subversion/Tool/SubversionTool.py +++ b/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 -- 2.30.9