From bdde006484bd8dbdf9ddf6ee51c187ad41809100 Mon Sep 17 00:00:00 2001
From: epriestley <epriestley@javelinjs.com>
Date: Sun, 20 Mar 2011 15:06:55 -0700
Subject: [PATCH] Detect SVN 1.6 "tree-conflicts".

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

diff --git a/src/repository/api/subversion/ArcanistSubversionAPI.php b/src/repository/api/subversion/ArcanistSubversionAPI.php
index e8dd6bb1..431396c5 100644
--- a/src/repository/api/subversion/ArcanistSubversionAPI.php
+++ b/src/repository/api/subversion/ArcanistSubversionAPI.php
@@ -132,6 +132,12 @@ class ArcanistSubversionAPI extends ArcanistRepositoryAPI {
             throw new Exception("Unrecognized item status '{$item}'.");
         }
 
+        // This is new in or around Subversion 1.6.
+        $tree_conflicts = (string)($entry->{'wc-status'}[0]['tree-conflicted']);
+        if ($tree_conflicts) {
+          $mask |= self::FLAG_CONFLICT;
+        }
+
         $files[$path] = $mask;
       }