/** * Returns the working copy path which resulted in a conflict. * * @return working copy path * @since 1.3 */ public File getPath() { return getMergeFiles().getWCFile(); }
/** * Returns the working copy path which resulted in a conflict. * * @return working copy path * @since 1.3 */ public File getPath() { return getMergeFiles().getWCFile(); }
/** * Returns the working copy path which resulted in a conflict. * * @return working copy path * @since 1.3 */ public File getPath() { return getMergeFiles().getWCFile(); }
public String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("[Conflict descriptor: merge files = "); buffer.append(getMergeFiles()); buffer.append("; kind = "); buffer.append(getNodeKind()); buffer.append("; reason = "); buffer.append(getConflictReason()); buffer.append("; action = "); buffer.append(getConflictAction()); buffer.append("; property conflicts = "); buffer.append(isPropertyConflict()); buffer.append("; property name = "); buffer.append(getPropertyName()); buffer.append("]"); return buffer.toString(); } }
public String toString() { final StringBuffer buffer = new StringBuffer(); buffer.append("[Conflict descriptor: merge files = "); buffer.append(getMergeFiles()); buffer.append("; kind = "); buffer.append(getNodeKind()); buffer.append("; reason = "); buffer.append(getConflictReason()); buffer.append("; action = "); buffer.append(getConflictAction()); buffer.append("; property conflicts = "); buffer.append(isPropertyConflict()); buffer.append("; property name = "); buffer.append(getPropertyName()); buffer.append("]"); return buffer.toString(); } }
File getPrejfileAbspath(File localAbspath) throws SVNException { List<SVNConflictDescription> conflicts = db.readConflicts(localAbspath); for (SVNConflictDescription cd : conflicts) { if (cd.isPropertyConflict()) { if (cd.getMergeFiles().getRepositoryPath().equals(THIS_DIR_PREJ + PROP_REJ_EXT)) { return SVNFileUtil.createFilePath(localAbspath, THIS_DIR_PREJ + PROP_REJ_EXT); } return SVNFileUtil.createFilePath(cd.getMergeFiles().getRepositoryPath()); } } return 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 ); }
for (SVNConflictDescription conflict : conflicts) { if (conflict.isTextConflict()) { if (conflict.getMergeFiles() != null) { SVNFileUtil.deleteFile(conflict.getMergeFiles().getBaseFile()); SVNFileUtil.deleteFile(conflict.getMergeFiles().getRepositoryFile()); SVNFileUtil.deleteFile(conflict.getMergeFiles().getLocalFile()); } else if (conflict.isPropertyConflict() && conflict.getMergeFiles() != null) { SVNFileUtil.deleteFile(conflict.getMergeFiles().getRepositoryFile());
treeConflict = (SVNTreeConflictDescription) conflictDescription; } else if (conflictDescription.isTextConflict()) { if (conflictDescription.getMergeFiles() != null) { if (conflictDescription.getMergeFiles().getBaseFile() != null) { conflictOld = conflictDescription.getMergeFiles().getBaseFile().getName(); if (conflictDescription.getMergeFiles().getRepositoryFile() != null) { conflictNew = conflictDescription.getMergeFiles().getRepositoryFile().getName(); if (conflictDescription.getMergeFiles().getLocalFile() != null) { conflictWorking = conflictDescription.getMergeFiles().getLocalFile().getName(); if (conflictDescription.getMergeFiles() != null) { propRejectFile = conflictDescription.getMergeFiles().getRepositoryFile().getName();
SVNMergeFileSet files = conflictDescription.getMergeFiles(); if (myAccept == SVNConflictAcceptPolicy.POSTPONE) { return new SVNConflictResult(SVNConflictChoice.POSTPONE, null);
SVNMergeFileSet files = conflictDescription.getMergeFiles(); if (myAccept == SVNConflictAcceptPolicy.POSTPONE) { return new SVNConflictResult(SVNConflictChoice.POSTPONE, null);
for (SVNConflictDescription desc : conflicts) { if (desc.isTextConflict()) { conflictOld = desc.getMergeFiles().getBaseFile(); conflictNew = desc.getMergeFiles().getRepositoryFile(); conflictWorking = desc.getMergeFiles().getLocalFile(); } else if (desc.isPropertyConflict()) { propRejectFile = desc.getMergeFiles().getRepositoryFile();
return null; SVNMergeFileSet mergeFiles = conflictDescription.getMergeFiles(); String basePath = null; String repositoryPath = null;
return null; SVNMergeFileSet mergeFiles = conflictDescription.getMergeFiles(); String basePath = null; String repositoryPath = null;
return null; SVNMergeFileSet mergeFiles = conflictDescription.getMergeFiles(); String basePath = null; String repositoryPath = null;
return null; SVNMergeFileSet mergeFiles = conflictDescription.getMergeFiles(); String basePath = null; String repositoryPath = null;
final SVNMergeFileSet cdf = cd.getMergeFiles(); if (isTextNeed && cd.isTextConflict()) { boolean done = false;