[meld/VersionControlRework: 7/123] meld.vc.svn: Use new resolve API, and non-deprecated command

[Kai Willadsen <kaiw src gnome org>]

commit 625f95bae1fbf21d2888ddbd48d84d8c76a24b39
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Mar 21 14:39:54 2015 +1000

    meld.vc.svn: Use new resolve API, and non-deprecated command

 meld/vc/svn.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index 35c2454..c339ab4 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -65,8 +65,10 @@ class Vc(_vc.Vc):
         return [self.CMD,"rm","--force"]
     def revert_command(self):
         return [self.CMD,"revert"]
-    def resolved_command(self):
-        return [self.CMD,"resolved"]
+
+    def resolve(self, runner, files):
+        command = [self.CMD, 'resolve', '--accept=working']
+        runner(command, files, refresh=True, working_dir=self.root)
 
     def get_path_for_repo_file(self, path, commit=None):
         if commit is None: