MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

correct comparison

Browse Source
This commit is contained in:
irengrig
2012-06-14 15:57:29 +04:00
parent d99d5a9976
commit 7b6307a704
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/commandLine/SvnInfoStructure.java
+6 -6
View File
@@ -84,17 +84,17 @@ public class SvnInfoStructure {
}
private SVNConflictReason parseConflictReason(String reason) throws SAXException {
if (ConflictDescriptor.Reason.edited.equals(reason)) {
if (ConflictDescriptor.Reason.edited.name().equals(reason)) {
return SVNConflictReason.EDITED;
} else if (ConflictDescriptor.Reason.obstructed.equals(reason)) {
} else if (ConflictDescriptor.Reason.obstructed.name().equals(reason)) {
return SVNConflictReason.OBSTRUCTED;
} else if (ConflictDescriptor.Reason.deleted.equals(reason)) {
} else if (ConflictDescriptor.Reason.deleted.name().equals(reason)) {
return SVNConflictReason.DELETED;
} else if (ConflictDescriptor.Reason.missing.equals(reason)) {
} else if (ConflictDescriptor.Reason.missing.name().equals(reason)) {
return SVNConflictReason.MISSING;
} else if (ConflictDescriptor.Reason.unversioned.equals(reason)) {
} else if (ConflictDescriptor.Reason.unversioned.name().equals(reason)) {
return SVNConflictReason.UNVERSIONED;
} else if (ConflictDescriptor.Reason.added.equals(reason)) {
} else if (ConflictDescriptor.Reason.added.name().equals(reason)) {
return SVNConflictReason.ADDED;
}
if ("edit".equals(reason)) {