- added resolved function

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6851 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Subversion/SubversionClient.py

@@ -276,6 +276,9 @@ try:
     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)

product/ERP5Subversion/Tool/SubversionTool.py

@@ -705,6 +705,18 @@ class SubversionTool(UniqueObject, Folder):
       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:
       # already absolute