retrieveParent(myCurrentFile.myWCFile, myIsDryRun);
} catch (SVNException e) {
if (e.getErrorMessage().getErrorCode() == SVNErrorCode.WC_NOT_LOCKED) {
if (myEventHandler != null) {
action = SVNEventAction.SKIP;
SVNEvent event = SVNEventFactory.createMergeEvent(myAdminInfo, commitPath, action,
expectedAction, SVNStatusType.MISSING, SVNStatusType.UNKNOWN, SVNNodeKind.FILE);
myEventHandler.handleEvent(event, ISVNEventHandler.UNKNOWN);
}
return;
}
throw e;
}
if (myCurrentFile.myFile != null || !myCurrentFile.myPropertyDiff.isEmpty()) {
String baseMimeType = (String) myCurrentFile.myBaseProperties.get(SVNProperty.MIME_TYPE);
String mimeType = (String) myCurrentFile.myPropertyDiff.get(SVNProperty.MIME_TYPE);
if (myCurrentFile.myIsAdded) {
type = getDiffCallback().fileAdded(commitPath,
myCurrentFile.myFile != null ? myCurrentFile.myBaseFile : null, myCurrentFile.myFile,
0, myRevision2, baseMimeType, mimeType,
myCurrentFile.myBaseProperties, myCurrentFile.myPropertyDiff);
} else {
type = getDiffCallback().fileChanged(commitPath,
myCurrentFile.myFile != null ? myCurrentFile.myBaseFile : null, myCurrentFile.myFile,
myRevision1, myRevision2, baseMimeType, mimeType,
myCurrentFile.myBaseProperties, myCurrentFile.myPropertyDiff);
}
}
if (myEventHandler != null) {
if (type[0] == SVNStatusType.MISSING || type[0] == SVNStatusType.OBSTRUCTED) {
action = SVNEventAction.SKIP;
} else if (myCurrentFile.myIsAdded) {
action = SVNEventAction.UPDATE_ADD;
} else {
action = SVNEventAction.UPDATE_UPDATE;
}
SVNEvent event = SVNEventFactory.createMergeEvent(myAdminInfo, commitPath, action,
expectedAction, type[0], type[1], SVNNodeKind.FILE);
myEventHandler.handleEvent(event, ISVNEventHandler.UNKNOWN);
}
}