Merge 0b5328f into c0878be

svn/local.py

@@ -84,7 +84,9 @@ def status(self, rel_path=None):
             wcstatus = entry.find('wc-status')
             wcstatus_attr = wcstatus.attrib
 
-            change_type_raw = wcstatus_attr['item']
+            props = wcstatus_attr['props']
+            change_type_raw = 'conflicted' if props == 'conflicted' else \
+                'modified' if props == 'modified' else wcstatus_attr['item']
             change_type = svn.constants.STATUS_TYPE_LOOKUP[change_type_raw]
 
             # This will be absent if the file is "unversioned". It'll be "-1"

tests/test_local.py

@@ -9,6 +9,10 @@ class TestLocalClient(unittest.TestCase):
     def test_status(self):
         with svn.test_support.temp_repo():
             with svn.test_support.temp_checkout() as (_, lc):
+                lc.run_command('propset', ['someProp', 'someVal', '.'])
+                s = next(lc.status())
+                self.assertTrue(s.type_raw_name == 'modified')
+
                 svn.test_support.populate_bigger_file_changes1()
 
                 status = {}