boolean isDir = adminArea.getThisDirName().equals(localPath);
List conflicts = new LinkedList();
List conflict = new LinkedList();
SVNStatusType status = SVNStatusType.UNCHANGED;
for (Iterator propEntries = propDiff.nameSet().iterator(); propEntries.hasNext();) {
String propName = (String) propEntries.next();
SVNPropertyValue toValue = propDiff.getSVNPropertyValue(propName);
SVNPropertyValue fromValue = serverBaseProps.getSVNPropertyValue(propName);
SVNPropertyValue workingValue = workingProperties.getSVNPropertyValue(propName);
SVNPropertyValue baseValue = baseProperties.getSVNPropertyValue(propName);
boolean isNormal = SVNProperty.isRegularProperty(propName);
if (baseMerge) {
changeProperty(baseProperties, propName, toValue);
}
if (isNormal) {
status = getPropMergeStatus(status, SVNStatusType.CHANGED);
}
SVNStatusType newStatus = null;
if (fromValue == null) {
newStatus = applySinglePropertyAdd(localPath, isDir, isNormal ? status : null,
workingProperties, propName, baseValue, toValue, workingValue, adminArea, log, conflict);
} else if (toValue == null) {
newStatus = applySinglePropertyDelete(localPath, isDir, isNormal ? status : null,