Changeset 23 in tailor for vcpx/svn.py

Timestamp:

06/22/04 10:20:21 (9 years ago)

Author:

lele@…

Hash name:

20040622082021-97f81-eb98333004c26196dca5b5ca6b4d8bc9491e40de

Message:

Catch the conflicts under svn

File:

• vcpx/svn.py (modified) (1 diff)

vcpx/svn.py

@@ -193 +193 @@
     def _applyChangeset(self, root, changeset):
         svnup = SvnUpdate(working_dir=root)
-        svnup(entry='.', revision=changeset.revision)       
+        out = svnup(output=True, entry='.', revision=changeset.revision)       
+        result = {}
+        for line in out:
+            if len(line)>2 and line[0] == 'C' and line[1] == ' ':
+                try: result[line[0]].append(line[2:-1])
+                except KeyError: result[line[0]] = [line[2:-1]]
+            
+        return result
         
     ## SyncronizableTargetWorkingDir