info.getConflictNewFile() != null ? info.getConflictNewFile().getName() : null, info.getConflictWrkFile() != null ? info.getConflictWrkFile().getName() : null, info.getPropConflictFile() != null ? info.getPropConflictFile().getName() : null );
info.getConflictNewFile() != null ? info.getConflictNewFile().getName() : null, info.getConflictWrkFile() != null ? info.getConflictWrkFile().getName() : null, info.getPropConflictFile() != null ? info.getPropConflictFile().getName() : null, info.getChangelistName(), info.getWorkingSize(), info.getRepositorySize(), depth,
buffer.append("Conflict Current Base File: " + cpath + "\n"); if (info.getPropConflictFile() != null) { String cpath = getSVNEnvironment().getRelativePath(info.getPropConflictFile()); cpath = SVNCommandUtil.getLocalPath(cpath); buffer.append("Conflict Properties File: " + cpath + "\n");
buffer.append("Conflict Current Base File: " + cpath + "\n"); if (info.getPropConflictFile() != null) { String cpath = getSVNEnvironment().getRelativePath(info.getPropConflictFile()); cpath = SVNCommandUtil.getLocalPath(cpath); buffer.append("Conflict Properties File: " + cpath + "\n");
info.getConflictNewFile() != null ? info.getConflictNewFile().getName() : null, info.getConflictWrkFile() != null ? info.getConflictWrkFile().getName() : null, info.getPropConflictFile() != null ? info.getPropConflictFile().getName() : null, info.getChangelistName(), info.getWorkingSize(), info.getRepositorySize(), depth,
info.getConflictNewFile() != null ? info.getConflictNewFile().getName() : null, info.getConflictWrkFile() != null ? info.getConflictWrkFile().getName() : null, info.getPropConflictFile() != null ? info.getPropConflictFile().getName() : null, info.getChangelistName(), info.getWorkingSize(), info.getRepositorySize(), depth,
info.getConflictNewFile() != null ? info.getConflictNewFile().getName() : null, info.getConflictWrkFile() != null ? info.getConflictWrkFile().getName() : null, info.getPropConflictFile() != null ? info.getPropConflictFile().getName() : null, info.getChangelistName(), info.getWorkingSize(), info.getRepositorySize(), depth,
info.getPropConflictFile() != null) { buffer = openXMLTag("conflict", SVNXMLUtil.XML_STYLE_NORMAL, null, buffer); if (info.getConflictOldFile() != null) { buffer = openCDataTag("cur-base-file", info.getConflictNewFile().getName(), buffer); if (info.getPropConflictFile() != null) { buffer = openCDataTag("prop-file", info.getPropConflictFile().getName(), buffer);
info.getPropConflictFile() != null) { buffer = openXMLTag("conflict", SVNXMLUtil.XML_STYLE_NORMAL, null, buffer); if (info.getConflictOldFile() != null) { buffer = openCDataTag("cur-base-file", info.getConflictNewFile().getName(), buffer); if (info.getPropConflictFile() != null) { buffer = openCDataTag("prop-file", info.getPropConflictFile().getName(), buffer);
info.getPropConflictFile() != null) { Collection<SVNConflictDescription> conflicts = new ArrayList<SVNConflictDescription>(); if (info.getTreeConflict() != null) { conflicts.add(cd.toConflictDescription()); if (info.getPropConflictFile() != null) { SVNWCConflictDescription17 cd = SVNWCConflictDescription17.createProp(info.getFile(), info.getKind(), null); cd.setTheirFile(info.getPropConflictFile()); conflicts.add(cd.toConflictDescription());
info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); if (info.getConflictOldFile() != null) { addTag(NEW_CONFLICT_TAG, info.getConflictNewFile().getName()); if (info.getPropConflictFile() != null) { addTag(PROP_CONFLICT_TAG, info.getPropConflictFile().getName());
info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); if (info.getConflictOldFile() != null) { addTag(NEW_CONFLICT_TAG, info.getConflictNewFile().getName()); if (info.getPropConflictFile() != null) { addTag(PROP_CONFLICT_TAG, info.getPropConflictFile().getName());
info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); if (info.getConflictOldFile() != null) { addTag(NEW_CONFLICT_TAG, info.getConflictNewFile().getName()); if (info.getPropConflictFile() != null) { addTag(PROP_CONFLICT_TAG, info.getPropConflictFile().getName());
info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); if (info.getConflictOldFile() != null) { addTag(NEW_CONFLICT_TAG, info.getConflictNewFile().getName()); if (info.getPropConflictFile() != null) { addTag(PROP_CONFLICT_TAG, info.getPropConflictFile().getName());