From c43d627cf2b6846597cd4f87d3d462d00e2fbd67 Mon Sep 17 00:00:00 2001
From: epriestley <git@epriestley.com>
Date: Thu, 6 Dec 2012 12:20:02 -0800
Subject: [PATCH] Remove ArcanistSubversionAPI::hasMergeConflicts()

Summary: No callsites, redundant with getMergeConflicts().

Test Plan: Grepped for callsites.

Reviewers: vrana

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D4093
---
 src/repository/api/ArcanistSubversionAPI.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/repository/api/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php
index 16460c5a..82c9402e 100644
--- a/src/repository/api/ArcanistSubversionAPI.php
+++ b/src/repository/api/ArcanistSubversionAPI.php
@@ -46,16 +46,6 @@ final class ArcanistSubversionAPI extends ArcanistRepositoryAPI {
     return $future;
   }
 
-
-  public function hasMergeConflicts() {
-    foreach ($this->getSVNStatus() as $path => $mask) {
-      if ($mask & self::FLAG_CONFLICT) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   public function getWorkingCopyStatus() {
     return $this->getSVNStatus();
   }