Commit 158081ff authored by Christophe Dumez's avatar Christophe Dumez

- added resolved function


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6851 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 80998330
...@@ -276,6 +276,9 @@ try: ...@@ -276,6 +276,9 @@ try:
def add(self, path): def add(self, path):
return self.client.add(path=path, force=True) return self.client.add(path=path, force=True)
def resolved(self, path):
return self.client.resolved(path=path)
def info(self, path): def info(self, path):
try: try:
entry = self.client.info(path=path) entry = self.client.info(path=path)
......
...@@ -704,6 +704,18 @@ class SubversionTool(UniqueObject, Folder): ...@@ -704,6 +704,18 @@ class SubversionTool(UniqueObject, Folder):
else: else:
path = self.relativeToAbsolute(path, bt) path = self.relativeToAbsolute(path, bt)
return client.revert(path) 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) : def relativeToAbsolute(self, path, bt) :
if path[0] == os.sep: if path[0] == os.sep:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment