} else if (entry.isFile()) {
parent = path.getParentFile();
name = entry.getName();
}
SVNLog log = null;
SVNAdminArea dir = wcAccess.retrieve(parent);
if (!dryRun) {
log = dir.getLog();
}
SVNStatusType result = dir.mergeProperties(name, baseProperties, diff, null, null, baseMerge, dryRun, log);
if (!dryRun) {
log.save();
dir.runLogs();
}
return result;
}