ContentRevision () { if (FilePatchStatus.DELETED.equals(myStatus)) { return null; } if (myNewContentRevision == null) { myConflicts = null; final FilePath newFilePath = getFilePath(); if (FilePatchStatus.ADDED.equals(myStatus)) { final String content = myPatch.getSingleHunkPatchText(); myNewContentRevision = new SimpleContentRevision(content, newFilePath, chooseNotNull(myPatch.getAfterVersionId(), VcsBundle .message("patch.apply.conflict.patched.version"))); } else { myNewContentRevision = new LazyPatchContentRevision(myCurrentBase, newFilePath, chooseNotNull(myPatch.getAfterVersionId(), VcsBundle .message("patch.apply.conflict.patched.version")), myPatch); } } return myNewContentRevision; }