public SVNConflictDescription toConflictDescription() { String wcPath = localAbspath != null ? localAbspath.getPath() : null; switch (kind) { case PROPERTY: return new SVNPropertyConflictDescription(new SVNMergeFileSet(null, null, baseFile, myFile, wcPath, theirFile, mergedFile, null, mimeType), nodeKind, propertyName, action, reason); case TEXT: return new SVNTextConflictDescription(new SVNMergeFileSet(null, null, baseFile, myFile, wcPath, theirFile, mergedFile, null, mimeType), nodeKind, action, reason); case TREE: return new SVNTreeConflictDescription(localAbspath, nodeKind, action, reason, operation, srcLeftVersion, srcRightVersion); } return null; }
public List<SVNConflictDescription> readConflicts(File localAbsPath) throws SVNException { final List<SVNWCConflictDescription17> conflicts = readConflicts(localAbsPath, false); final List<SVNConflictDescription> translated = new ArrayList<SVNConflictDescription>(); for(SVNWCConflictDescription17 description : conflicts) { final SVNMergeFileSet mergeFiles = new SVNMergeFileSet(null, null, description.getBaseFile(), description.getMyFile(), localAbsPath.getAbsolutePath(), description.getTheirFile(), description.getMergedFile(), null, description.getMimeType()); if (description.getKind() == ConflictKind.PROPERTY) { translated.add(new SVNPropertyConflictDescription(mergeFiles, description.getNodeKind(), description.getPropertyName(), description.getAction(), description.getReason())); } else if (description.getKind() == ConflictKind.TREE) { translated.add(new SVNTreeConflictDescription(localAbsPath, description.getNodeKind(), description.getAction(), description.getReason(), description.getOperation(), description.getSrcLeftVersion(), description.getSrcRightVersion())); } else if (description.getKind() == ConflictKind.TEXT) { translated.add(new SVNTextConflictDescription(mergeFiles, description.getNodeKind(), description.getAction(), description.getReason())); } } return translated; }
reason = SVNConflictReason.OBSTRUCTED; SVNConflictDescription description = new SVNPropertyConflictDescription(fileSet, isDir ? SVNNodeKind.DIR : SVNNodeKind.FILE, propName, action, reason); SVNConflictResult result = myConflictCallback.handleConflict(description);
reason = SVNConflictReason.OBSTRUCTED; SVNConflictDescription description = new SVNPropertyConflictDescription(fileSet, isDir ? SVNNodeKind.DIR : SVNNodeKind.FILE, propName, action, reason); SVNConflictResult result = myConflictCallback.handleConflict(description);
reason = SVNConflictReason.OBSTRUCTED; SVNConflictDescription description = new SVNPropertyConflictDescription(fileSet, isDir ? SVNNodeKind.DIR : SVNNodeKind.FILE, propName, action, reason); SVNConflictResult result = myConflictCallback.handleConflict(description);