Change (@Nullable ContentRevision before, @Nullable ContentRevision after, @NotNull FileStatus fStatus, @NotNull Status svnStatus) { ConflictedSvnChange change = new ConflictedSvnChange(before, after, fStatus, getState(svnStatus), after == null ? before.getFile() : after.getFile()); change.setIsPhantom(svnStatus.is(StatusType.STATUS_DELETED) && !svnStatus.getRevision().isValid()); change.setBeforeDescription(svnStatus.getTreeConflict()); patchWithPropertyChange(change, svnStatus, null); return change; }