[Checkins] SVN: z3c.vcsync/trunk/src/z3c/vcsync/svn.py Implement a simple conflict resolution algorithm.

[Martijn Faassen]

Log message for revision 77484:
  Implement a simple conflict resolution algorithm.
  

Changed:
  U   z3c.vcsync/trunk/src/z3c/vcsync/svn.py

-=-
Modified: z3c.vcsync/trunk/src/z3c/vcsync/svn.py
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/svn.py	2007-07-05 20:04:41 UTC (rev 77483)
+++ z3c.vcsync/trunk/src/z3c/vcsync/svn.py	2007-07-05 20:41:45 UTC (rev 77484)
@@ -36,7 +36,7 @@
         self._updated = False
         
     def resolve(self):
-        pass
+        _resolve_helper(self.path)
 
     def commit(self, message):
         self.path.commit(message)
@@ -96,3 +96,12 @@
                     files.add(path)                
         return False
     
+def _resolve_helper(path):
+    for p in path.listdir():
+        if not p.check(dir=True):
+            continue
+        for conflict in p.status().conflict:
+            mine = p.join(conflict.basename + '.mine')
+            conflict.write(mine.read())
+            conflict._svn('resolved')
+        _resolve_helper(p)