public SVNTreeConflictDescription opReadTreeConflict(File localAbsPath) throws SVNException { final List<SVNConflictDescription> conflicts = readConflicts(localAbsPath); if (conflicts == null || conflicts.isEmpty()) { return null; } for (SVNConflictDescription conflictDescription : conflicts) { if (conflictDescription.isTreeConflict()) { return (SVNTreeConflictDescription) conflictDescription; } } return null; }
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; }
if (desc.isTreeConflict()) { if (!resolveTree) break;
public SVNConflictResult handleConflictNoStats(SVNConflictDescription conflictDescription) throws SVNException { if (conflictDescription.isTreeConflict()) { return null;
public SVNConflictResult handleConflictNoStats(SVNConflictDescription conflictDescription) throws SVNException { if (conflictDescription.isTreeConflict()) { return null;
if (conflictDescription.isTreeConflict()) { if (!resolveTree) { break;
ConflictVersion right = null; int op = 0; if (conflictDescription.isTreeConflict()) { SVNTreeConflictDescription tc = (SVNTreeConflictDescription) conflictDescription; left = createConflictVersion(tc.getSourceLeftVersion());
ConflictVersion right = null; int op = 0; if (conflictDescription.isTreeConflict()) { SVNTreeConflictDescription tc = (SVNTreeConflictDescription) conflictDescription; left = createConflictVersion(tc.getSourceLeftVersion());
ConflictVersion right = null; int op = 0; if (conflictDescription.isTreeConflict()) { SVNTreeConflictDescription tc = (SVNTreeConflictDescription) conflictDescription; left = createConflictVersion(tc.getSourceLeftVersion());
ConflictVersion right = null; int op = 0; if (conflictDescription.isTreeConflict()) { SVNTreeConflictDescription tc = (SVNTreeConflictDescription) conflictDescription; left = createConflictVersion(tc.getSourceLeftVersion());
if (conflicts != null) { for (SVNConflictDescription conflictDescription : conflicts) { if (conflictDescription.isTreeConflict() && conflictDescription instanceof SVNTreeConflictDescription) { treeConflict = (SVNTreeConflictDescription) conflictDescription; } else if (conflictDescription.isTextConflict()) {
} else if (isTreeNeed && cd.isTreeConflict()) { info.treeConflicted = true; info.treeConflict = (SVNTreeConflictDescription) cd;