public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException { SVNConflictResult conflictResult = handleConflictNoStats(conflictDescription); if (conflictResult != null && conflictResult.getConflictChoice() != SVNConflictChoice.POSTPONE) { SVNConflictStats conflictStats = getConflictStats(); if (conflictDescription instanceof SVNTextConflictDescription) { conflictStats.incrementTextConflictsResolved(SVNFileUtil.getFilePath(conflictDescription.getPath())); } else if (conflictDescription instanceof SVNPropertyConflictDescription) { conflictStats.incrementPropConflictsResolved(SVNFileUtil.getFilePath(conflictDescription.getPath())); } else if (conflictDescription instanceof SVNTreeConflictDescription) { conflictStats.incrementTreeConflictsResolved(SVNFileUtil.getFilePath(conflictDescription.getPath())); } else { SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.ASSERTION_FAIL, "Invalid conflict kind on ''{0}''", conflictDescription.getPath()); SVNErrorManager.error(errorMessage, SVNLogType.WC); } } return conflictResult; }
public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException { SVNConflictResult conflictResult = handleConflictNoStats(conflictDescription); if (conflictResult != null && conflictResult.getConflictChoice() != SVNConflictChoice.POSTPONE) { SVNConflictStats conflictStats = getConflictStats(); if (conflictDescription instanceof SVNTextConflictDescription) { conflictStats.incrementTextConflictsResolved(SVNFileUtil.getFilePath(conflictDescription.getPath())); } else if (conflictDescription instanceof SVNPropertyConflictDescription) { conflictStats.incrementPropConflictsResolved(SVNFileUtil.getFilePath(conflictDescription.getPath())); } else if (conflictDescription instanceof SVNTreeConflictDescription) { conflictStats.incrementTreeConflictsResolved(SVNFileUtil.getFilePath(conflictDescription.getPath())); } else { SVNErrorMessage errorMessage = SVNErrorMessage.create(SVNErrorCode.ASSERTION_FAIL, "Invalid conflict kind on ''{0}''", conflictDescription.getPath()); SVNErrorManager.error(errorMessage, SVNLogType.WC); } } return conflictResult; }
if (conflictResolver != null && recordConflictsResolver.hasConflicts()) { for (SVNConflictDescription conflictDescription : recordConflictsResolver.getConflicts()) { getWcContext().resolvedConflict(conflictDescription.getPath(), SVNDepth.UNKNOWN, true, null, true, null);
private ConflictDescriptor getConflictDescription(SVNConflictDescription conflictDescription) throws ClientException { ConflictVersion srcLeft = null; ConflictVersion srcRight = null; ConflictDescriptor.Operation operation = Operation.none; if (conflictDescription instanceof SVNTreeConflictDescription) { SVNTreeConflictDescription treeConflictDescription = (SVNTreeConflictDescription) conflictDescription; srcLeft = getConflictVersion(treeConflictDescription.getSourceLeftVersion()); srcRight = getConflictVersion(treeConflictDescription.getSourceRightVersion()); operation = getConflictDescriptorOperation(treeConflictDescription.getOperation()); } return new ConflictDescriptor( getFilePath(conflictDescription.getPath()), getConflictDescriptorKind(conflictDescription), getNodeKind(conflictDescription.getNodeKind()), conflictDescription.getPropertyName(), conflictDescription.getMergeFiles().isBinary(), conflictDescription.getMergeFiles().getMimeType(), getConflictDescriptorAction(conflictDescription.getConflictAction()), getConflictDescriptorReason(conflictDescription.getConflictReason()), operation, getFilePath(conflictDescription.getMergeFiles().getBaseFile()), getFilePath(conflictDescription.getMergeFiles().getRepositoryFile()), getFilePath(conflictDescription.getMergeFiles().getLocalFile()), getFilePath(conflictDescription.getMergeFiles().getResultFile()), srcLeft, srcRight ); }