private void countConflicts(SVNStatus status) throws SVNException { if (status.isConflicted()) { if (status.getPropRejectFile() != null) { propConflicts++; } if (status.getConflictWrkFile() != null || status.getConflictOldFile() != null || status.getConflictNewFile() != null) { textConflicts++; } if (status.getTreeConflict() != null) { treeConflicts++; } } }
private void countConflicts(SVNStatus status) throws SVNException { if (status.isConflicted()) { if (status.getPropRejectFile() != null) { propConflicts++; } if (status.getConflictWrkFile() != null || status.getConflictOldFile() != null || status.getConflictNewFile() != null) { textConflicts++; } if (status.getTreeConflict() != null) { treeConflicts++; } } }
if(status.getConflictOldFile()!=null){ conflictOld = status.getConflictOldFile().getName();
if(status.getConflictOldFile()!=null){ conflictOld = status.getConflictOldFile().getName();
if(status.getConflictOldFile()!=null){ conflictOld = status.getConflictOldFile().getName();
if(status.getConflictOldFile()!=null){ conflictOld = status.getConflictOldFile().getName();
if(status.getConflictOldFile()!=null){ conflictOld = status.getConflictOldFile().getName();