From ef990703fa3bf2c8accaa93ea1714a5f068709ae Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Fri, 13 Apr 2012 14:11:10 -0700
Subject: [PATCH] Fix SVN commit change parser for directories copied from the
 same path

Summary: See [[ https://secure.phabricator.com/D2215?id=3773#inline-2451 | D2215#inline-2451 ]].

Test Plan: Reparsed commit which was wrong, now correct.

Reviewers: epriestley, jungejason

Reviewed By: jungejason

CC: aran

Differential Revision: https://secure.phabricator.com/D2232
---
 .../svn/PhabricatorRepositorySvnCommitChangeParserWorker.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php
index da84de9a1a..e06759d717 100644
--- a/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php
+++ b/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php
@@ -277,7 +277,8 @@ class PhabricatorRepositorySvnCommitChangeParserWorker
                     }
                   }
 
-                  if (empty($raw_paths[$full_from])) {
+                  if (empty($raw_paths[$full_from]) &&
+                      empty($effects[$full_from])) {
                     if ($other_type == DifferentialChangeType::TYPE_COPY_AWAY) {
                       $effects[$full_from] = array(
                         'rawPath'         => $full_from,