info.getConflictOldFile() != null ? info.getConflictOldFile().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(),
buffer.append("Conflict Previous Base File: " + cpath + "\n"); if (info.getConflictWrkFile() != null) { String cpath = getSVNEnvironment().getRelativePath(info.getConflictWrkFile()); cpath = SVNCommandUtil.getLocalPath(cpath); buffer.append("Conflict Previous Working File: " + cpath + "\n");
buffer.append("Conflict Previous Base File: " + cpath + "\n"); if (info.getConflictWrkFile() != null) { String cpath = getSVNEnvironment().getRelativePath(info.getConflictWrkFile()); cpath = SVNCommandUtil.getLocalPath(cpath); buffer.append("Conflict Previous Working File: " + cpath + "\n");
if (info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getConflictWrkFile() != null || info.getPropConflictFile() != null) { buffer = openXMLTag("conflict", SVNXMLUtil.XML_STYLE_NORMAL, null, buffer); buffer = openCDataTag("prev-base-file", info.getConflictOldFile().getName(), buffer); if (info.getConflictWrkFile() != null) { buffer = openCDataTag("prev-wc-file", info.getConflictWrkFile().getName(), buffer);
if (info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getConflictWrkFile() != null || info.getPropConflictFile() != null) { buffer = openXMLTag("conflict", SVNXMLUtil.XML_STYLE_NORMAL, null, buffer); buffer = openCDataTag("prev-base-file", info.getConflictOldFile().getName(), buffer); if (info.getConflictWrkFile() != null) { buffer = openCDataTag("prev-wc-file", info.getConflictWrkFile().getName(), buffer);
info.getConflictWrkFile() != null || info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getPropConflictFile() != null) { Collection<SVNConflictDescription> conflicts = new ArrayList<SVNConflictDescription>(); conflicts.add(info.getTreeConflict()); if (info.getConflictWrkFile() != null || info.getConflictNewFile() != null || info.getConflictOldFile() != null) { SVNWCConflictDescription17 cd = SVNWCConflictDescription17.createText(info.getFile()); cd.setTheirFile(info.getConflictNewFile()); cd.setBaseFile(info.getConflictOldFile()); cd.setMyFile(info.getConflictWrkFile()); conflicts.add(cd.toConflictDescription());
if (info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getConflictWrkFile() != null || info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); addTag(OLD_CONFLICT_TAG, info.getConflictOldFile().getName()); if (info.getConflictWrkFile() != null) { addTag(WRK_CONFLICT_TAG, info.getConflictWrkFile().getName());
if (info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getConflictWrkFile() != null || info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); addTag(OLD_CONFLICT_TAG, info.getConflictOldFile().getName()); if (info.getConflictWrkFile() != null) { addTag(WRK_CONFLICT_TAG, info.getConflictWrkFile().getName());
if (info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getConflictWrkFile() != null || info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); addTag(OLD_CONFLICT_TAG, info.getConflictOldFile().getName()); if (info.getConflictWrkFile() != null) { addTag(WRK_CONFLICT_TAG, info.getConflictWrkFile().getName());
if (info.getConflictNewFile() != null || info.getConflictOldFile() != null || info.getConflictWrkFile() != null || info.getPropConflictFile() != null) { openTag(CONFLICT_TAG); addTag(OLD_CONFLICT_TAG, info.getConflictOldFile().getName()); if (info.getConflictWrkFile() != null) { addTag(WRK_CONFLICT_TAG, info.getConflictWrkFile().getName());