revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 06:42:41 +01:00
Code Issues Releases Wiki Activity

Detect SVN 1.6 "tree-conflicts".

Browse source
This commit is contained in:
epriestley 2011-03-20 15:06:55 -07:00
parent efcd70c2d7
commit bdde006484
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,12 @@ class ArcanistSubversionAPI extends ArcanistRepositoryAPI {
throw new Exception("Unrecognized item status '{$item}'."); 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; $files[$path] = $mask;
} }