Examples with ConflictedSvnChange org.jetbrains.idea.svn.ConflictedSvnChange used on opensource projects

Example 1 with ConflictedSvnChange

use of org.jetbrains.idea.svn.ConflictedSvnChange in project intellij-community by JetBrains.

the class SvnTreeConflictDiffRequestProvider method isEquals.

@NotNull
@Override
public ThreeState isEquals(@NotNull Change change1, @NotNull Change change2) {
    if (change1 instanceof ConflictedSvnChange && change2 instanceof ConflictedSvnChange) {
        if (!change1.isTreeConflict() && !change2.isTreeConflict())
            return ThreeState.UNSURE;
        if (!change1.isTreeConflict() || !change2.isTreeConflict())
            return ThreeState.NO;
        TreeConflictDescription description1 = ((ConflictedSvnChange) change1).getBeforeDescription();
        TreeConflictDescription description2 = ((ConflictedSvnChange) change2).getBeforeDescription();
        return TreeConflictRefreshablePanel.descriptionsEqual(description1, description2) ? ThreeState.YES : ThreeState.NO;
    }
    return ThreeState.UNSURE;
}