/** * Creates a new <code>SVNTreeConflictDescription</code>. * * @param path wc path * @param nodeKind kind of the node, on which the tree conflict occurred * @param conflictAction action which lead to the conflict * @param conflictReason reason why the conflict occurred * @param operation user operation which exposed the conflict * @param sourceLeftVersion info on the "merge-left source" or "older" version of incoming change * @param sourceRightVersion info on the "merge-right source" or "their" version of incoming change * @since 1.3 */ public SVNTreeConflictDescription(File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion) { super(new SVNMergeFileSet(null, null, null, path, null, null, null, null, null), nodeKind, conflictAction, conflictReason); myOperation = operation; mySourceLeftVersion = sourceLeftVersion; mySourceRightVersion = sourceRightVersion; }
/** * Creates a new <code>SVNTreeConflictDescription</code>. * * @param path wc path * @param nodeKind kind of the node, on which the tree conflict occurred * @param conflictAction action which lead to the conflict * @param conflictReason reason why the conflict occurred * @param operation user operation which exposed the conflict * @param sourceLeftVersion info on the "merge-left source" or "older" version of incoming change * @param sourceRightVersion info on the "merge-right source" or "their" version of incoming change * @since 1.3 */ public SVNTreeConflictDescription(File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion) { super(new SVNMergeFileSet(null, null, null, path, null, null, null, null, null), nodeKind, conflictAction, conflictReason); myOperation = operation; mySourceLeftVersion = sourceLeftVersion; mySourceRightVersion = sourceRightVersion; }
/** * Creates a new <code>SVNTreeConflictDescription</code>. * * @param path wc path * @param nodeKind kind of the node, on which the tree conflict occurred * @param conflictAction action which lead to the conflict * @param conflictReason reason why the conflict occurred * @param operation user operation which exposed the conflict * @param sourceLeftVersion info on the "merge-left source" or "older" version of incoming change * @param sourceRightVersion info on the "merge-right source" or "their" version of incoming change * @since 1.3 */ public SVNTreeConflictDescription(File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion) { super(new SVNMergeFileSet(null, null, null, path, null, null, null, null, null), nodeKind, conflictAction, conflictReason); myOperation = operation; mySourceLeftVersion = sourceLeftVersion; mySourceRightVersion = sourceRightVersion; }
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; }
File resultFile = SVNAdminUtil.createTmpFile(this); SVNMergeFileSet mergeFileSet = new SVNMergeFileSet(this, log, base, tmpTarget, localPath, latest, resultFile, copyFromText, mimeType);
File resultFile = SVNAdminUtil.createTmpFile(this); SVNMergeFileSet mergeFileSet = new SVNMergeFileSet(this, log, base, tmpTarget, localPath, latest, resultFile, copyFromText, mimeType);
File resultFile = SVNAdminUtil.createTmpFile(this); SVNMergeFileSet mergeFileSet = new SVNMergeFileSet(this, log, base, tmpTarget, localPath, latest, resultFile, copyFromText, mimeType);
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; }
mimeType = workingProps.getStringValue(SVNProperty.MIME_TYPE); SVNMergeFileSet fileSet = new SVNMergeFileSet(adminArea, log, baseFile, workingFile, localPath, newFile, mergedFile, null, mimeType);
mimeType = workingProps.getStringValue(SVNProperty.MIME_TYPE); SVNMergeFileSet fileSet = new SVNMergeFileSet(adminArea, log, baseFile, workingFile, localPath, newFile, mergedFile, null, mimeType);
mimeType = workingProps.getStringValue(SVNProperty.MIME_TYPE); SVNMergeFileSet fileSet = new SVNMergeFileSet(adminArea, log, baseFile, workingFile, localPath, newFile, mergedFile, null, mimeType);
SVNMergeFileSet mergeFileSet = new SVNMergeFileSet(this, null, conflictOldFile, conflictWorkingFile, name, conflictNewFile, autoResolveSourceFile, null, null);
SVNMergeFileSet mergeFileSet = new SVNMergeFileSet(this, null, conflictOldFile, conflictWorkingFile, name, conflictNewFile, autoResolveSourceFile, null, null);