[Erp5-report] r6851 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 21 16:47:10 CEST 2006
Author: chris
Date: Fri Apr 21 16:47:07 2006
New Revision: 6851
URL: http://svn.erp5.org?rev=6851&view=rev
Log:
- added resolved function
Modified:
erp5/trunk/products/ERP5Subversion/SubversionClient.py
erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
Modified: erp5/trunk/products/ERP5Subversion/SubversionClient.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/SubversionClient.py?rev=6851&r1=6850&r2=6851&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Fri Apr 21 16:47:07 2006
@@ -276,6 +276,9 @@
def add(self, path):
return self.client.add(path=path, force=True)
+ def resolved(self, path):
+ return self.client.resolved(path=path)
+
def info(self, path):
try:
entry = self.client.info(path=path)
Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=6851&r1=6850&r2=6851&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Fri Apr 21 16:47:07 2006
@@ -704,6 +704,18 @@
else:
path = self.relativeToAbsolute(path, bt)
return client.revert(path)
+
+ security.declareProtected('Import/Export objects', 'resolved')
+ # path can be absolute or relative
+ def resolved(self, path, bt):
+ """remove conflicted status
+ """
+ client = self._getClient()
+ if isinstance(path, list) :
+ path = [self.relativeToAbsolute(x, bt) for x in path]
+ else:
+ path = self.relativeToAbsolute(path, bt)
+ return client.resolved(path)
def relativeToAbsolute(self, path, bt) :
if path[0] == os.sep:
More information about the Erp5-report
mailing list