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(); } }
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); } }
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 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; }
break; else if (desc.isPropertyConflict()) { if ("".equals(resolveProps)) break;
conflictDescription.getConflictAction() == SVNConflictAction.EDIT && conflictDescription.getConflictReason() == SVNConflictReason.EDITED) || conflictDescription.isPropertyConflict()) { if (conflictDescription.isPropertyConflict()) { String message = "Conflict for property ''{0}'' discovered on ''{1}''."; message = MessageFormat.format(message, new Object[] { conflictDescription.getPropertyName(), if (!files.isBinary() && !conflictDescription.isPropertyConflict()) { message += ",\n (mc) mine-conflict, (tc) theirs-conflict"; mySVNEnvironment.getErr().println(); continue; } else if (conflictDescription.isPropertyConflict()) { mySVNEnvironment.getErr().println("Invalid option; cannot choose based on conflicts for properties."); mySVNEnvironment.getErr().println(); mySVNEnvironment.getErr().println(); continue; } else if (conflictDescription.isPropertyConflict()) { mySVNEnvironment.getErr().println("Invalid option; cannot choose based on conflicts for properties."); mySVNEnvironment.getErr().println(); mySVNEnvironment.getErr().println(); continue; } else if (conflictDescription.isPropertyConflict()) { mySVNEnvironment.getErr().println("Invalid option; cannot display conflicts for properties."); mySVNEnvironment.getErr().println();
conflictDescription.getConflictAction() == SVNConflictAction.EDIT && conflictDescription.getConflictReason() == SVNConflictReason.EDITED) || conflictDescription.isPropertyConflict()) { if (conflictDescription.isPropertyConflict()) { String message = "Conflict for property ''{0}'' discovered on ''{1}''."; message = MessageFormat.format(message, new Object[] { conflictDescription.getPropertyName(), if (!files.isBinary() && !conflictDescription.isPropertyConflict()) { message += ",\n (mc) mine-conflict, (tc) theirs-conflict"; mySVNEnvironment.getErr().println(); continue; } else if (conflictDescription.isPropertyConflict()) { mySVNEnvironment.getErr().println("Invalid option; cannot choose based on conflicts for properties."); mySVNEnvironment.getErr().println(); mySVNEnvironment.getErr().println(); continue; } else if (conflictDescription.isPropertyConflict()) { mySVNEnvironment.getErr().println("Invalid option; cannot choose based on conflicts for properties."); mySVNEnvironment.getErr().println(); mySVNEnvironment.getErr().println(); continue; } else if (conflictDescription.isPropertyConflict()) { mySVNEnvironment.getErr().println("Invalid option; cannot display conflicts for properties."); mySVNEnvironment.getErr().println();
resolved = true; } else if (conflictDescription.isPropertyConflict()) { if (resolveProp == null) { break;
conflictNew = desc.getMergeFiles().getRepositoryFile(); conflictWorking = desc.getMergeFiles().getLocalFile(); } else if (desc.isPropertyConflict()) { propRejectFile = desc.getMergeFiles().getRepositoryFile();
getConflictKind(conflictDescription.isPropertyConflict()), getNodeKind(conflictDescription.getNodeKind()), conflictDescription.getPropertyName(),
getConflictKind(conflictDescription.isPropertyConflict()), getNodeKind(conflictDescription.getNodeKind()), conflictDescription.getPropertyName(),
getConflictKind(conflictDescription.isPropertyConflict()), getNodeKind(conflictDescription.getNodeKind()), conflictDescription.getPropertyName(),
getConflictKind(conflictDescription.isPropertyConflict()), getNodeKind(conflictDescription.getNodeKind()), conflictDescription.getPropertyName(),
} else if (conflictDescription.isPropertyConflict()) { if (conflictDescription.getMergeFiles() != null) { propRejectFile = conflictDescription.getMergeFiles().getRepositoryFile().getName();
SVNFileUtil.deleteFile(conflict.getMergeFiles().getLocalFile()); } else if (conflict.isPropertyConflict() && conflict.getMergeFiles() != null) { SVNFileUtil.deleteFile(conflict.getMergeFiles().getRepositoryFile());
resolvedText = true; } else if (isPropNeed && cd.isPropertyConflict()) { if (cdf.getRepositoryFile() != null) { final File path = SVNFileUtil.isAbsolute(cdf.getRepositoryFile()) ? cdf.getRepositoryFile() : SVNFileUtil.createFilePath(rootPath, cdf.getRepositoryFile());