if (baseValue != null && workingValue == null) {
reason = SVNConflictReason.DELETED;
} else if (baseValue == null && workingValue != null) {
reason = SVNConflictReason.OBSTRUCTED;
}
SVNConflictDescription description = new SVNPropertyConflictDescription(fileSet,
isDir ? SVNNodeKind.DIR : SVNNodeKind.FILE, propName, action, reason);
SVNConflictResult result = myConflictCallback.handleConflict(description);
if (result == null) {
SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.WC_CONFLICT_RESOLVER_FAILURE,
"Conflict callback violated API: returned no results.");