From fe256c59f44a821b66de1e089b41e26cf06ba9af Mon Sep 17 00:00:00 2001
From: epriestley <epriestley@javelinjs.com>
Date: Mon, 21 Feb 2011 16:59:37 -0800
Subject: [PATCH] Correctly parse conflicted files out of SVN XML.

Summary:

Test Plan:

Reviewers:

CC:
---
 src/repository/api/subversion/ArcanistSubversionAPI.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/repository/api/subversion/ArcanistSubversionAPI.php b/src/repository/api/subversion/ArcanistSubversionAPI.php
index b3f80b15..b1d9cca4 100644
--- a/src/repository/api/subversion/ArcanistSubversionAPI.php
+++ b/src/repository/api/subversion/ArcanistSubversionAPI.php
@@ -109,6 +109,9 @@ class ArcanistSubversionAPI extends ArcanistRepositoryAPI {
           case 'deleted':
             $mask |= self::FLAG_DELETED;
             break;
+          case 'conflicted':
+            $mask |= self::FLAG_CONFLICT;
+            break;
           default:
             throw new Exception("Unrecognized item status '{$item}'.");
         }