private void preloadRevisionContents(ContentRevision cr) throws VcsException {
if (cr instanceof BinaryContentRevision) {
((BinaryContentRevision) cr).getBinaryContent();
} else {
cr.getContent();
}
}
public boolean isConflictingChange(final Project project) {
ContentRevision afterRevision = getChange(project).getAfterRevision();
if (afterRevision == null) return false;
try {
afterRevision.getContent();
} catch (VcsException e) {
if (e.getCause() instanceof ApplyPatchException) {
return true;
}
}
return false;
}