private ConflictDescriptor.Kind getConflictDescriptorKind(SVNConflictDescription conflictDescription) { if (conflictDescription == null) { return null; } if (conflictDescription.isTextConflict()) { return ConflictDescriptor.Kind.text; } else if (conflictDescription.isPropertyConflict()) { return ConflictDescriptor.Kind.property; } else if (conflictDescription.isTreeConflict()) { return ConflictDescriptor.Kind.tree; } else { throw new IllegalArgumentException("Unknown conflict kind: " + conflictDescription); } }
private NodeAlreadyConflictedInfo isNodeAlreadyConflicted(File localAbspath) throws SVNException { NodeAlreadyConflictedInfo alreadyConflictedInfo = new NodeAlreadyConflictedInfo(); List<SVNConflictDescription> conflicts = myWCContext.getDb().readConflicts(localAbspath); for (SVNConflictDescription cd : conflicts) { if (cd.isTreeConflict()) { alreadyConflictedInfo.conflicted = true; alreadyConflictedInfo.conflictIgnored = false; return alreadyConflictedInfo; } else if (cd.isPropertyConflict() || cd.isTextConflict()) { SVNWCContext.ConflictInfo info = myWCContext.getConflicted(localAbspath, true, true, true); alreadyConflictedInfo.conflicted = info.textConflicted || info.propConflicted || info.treeConflicted; alreadyConflictedInfo.conflictIgnored = info.ignored; return alreadyConflictedInfo; } } alreadyConflictedInfo.conflicted = false; alreadyConflictedInfo.conflictIgnored = false; return alreadyConflictedInfo; }
break; else if (desc.isTextConflict()) { if (!resolveText) break;
} else if (conflictDescription.isTextConflict()) { if (!resolveText) { break;
conflicts = getDb().readConflicts(localAbsPath); for (SVNConflictDescription desc : conflicts) { if (desc.isTextConflict()) { conflictOld = desc.getMergeFiles().getBaseFile(); conflictNew = desc.getMergeFiles().getRepositoryFile();
if (conflictDescription.isTreeConflict() && conflictDescription instanceof SVNTreeConflictDescription) { treeConflict = (SVNTreeConflictDescription) conflictDescription; } else if (conflictDescription.isTextConflict()) { if (conflictDescription.getMergeFiles() != null) { if (conflictDescription.getMergeFiles().getBaseFile() != null) {
if (!keepLocal && conflicts != null) { for (SVNConflictDescription conflict : conflicts) { if (conflict.isTextConflict()) { if (conflict.getMergeFiles() != null) { SVNFileUtil.deleteFile(conflict.getMergeFiles().getBaseFile());
for (final SVNConflictDescription cd : conflicts) { final SVNMergeFileSet cdf = cd.getMergeFiles(); if (isTextNeed && cd.isTextConflict()) { boolean done = false;