Changeset 1362 in tailor

Timestamp:

04/24/07 20:38:31 (6 years ago)

Author:

zooko@…

Hash name:

20070424183831-92b7f-4ec342a6057d7fb04e649bbe0818c7933dc6b5f7

Message:

fix parsing of darcs conflict output

File:

• vcpx/repository/darcs/source.py (modified) (1 diff)

vcpx/repository/darcs/source.py

@@ -409 +409 @@
         while line:
             if line.startswith('We have conflicts in the following files:'):
-                files = output.readline()[:-1].split('./')[1:]
+                files = output.readline()[:-1].split(' ')
                 self.log.warning("Conflict after 'darcs pull': %s",
                                  ' '.join(files))
-                conflicts.extend(['./' + f for f in files])
+                conflicts.extend(files)
             line = output.readline()