revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-10 08:52:39 +01:00
Code Issues Releases Wiki Activity

Correctly parse conflicted files out of SVN XML.

Browse source 
Summary:

Test Plan:

Reviewers:

CC:
This commit is contained in:
epriestley 2011-02-21 16:59:37 -08:00
parent 0eecd3108f
commit fe256c59f4
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/repository/api/subversion/ArcanistSubversionAPI.php
View file

@ -109,6 +109,9 @@ class ArcanistSubversionAPI extends ArcanistRepositoryAPI {
case 'deleted': case 'deleted':
$mask |= self::FLAG_DELETED; $mask |= self::FLAG_DELETED;
break; break;
case 'conflicted':
$mask |= self::FLAG_CONFLICT;
break;
default: default:
throw new Exception("Unrecognized item status '{$item}'."); throw new Exception("Unrecognized item status '{$item}'.");
} }