Changeset 26 in tailor for vcpx/svn.py

Timestamp:

06/22/04 15:56:34 (9 years ago)

Author:

lele@…

Hash name:

20040622135634-97f81-954c6562d26feaab38b59b3eb0be64dfcd939066

Message:

Make _applyChangeset return a list of conflicts, not a dictionary

File:

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

vcpx/svn.py

@@ -194 +194 @@
         svnup = SvnUpdate(working_dir=root)
         out = svnup(output=True, entry='.', revision=changeset.revision)       
-        result = {}
+        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]]
+                result.append(line[2:-1])
             
         return result