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.getConflictNewFile()!=null){ conflictNew = status.getConflictNewFile().getName();
if(status.getConflictNewFile()!=null){ conflictNew = status.getConflictNewFile().getName();
if(status.getConflictNewFile()!=null){ conflictNew = status.getConflictNewFile().getName();
if(status.getConflictNewFile()!=null){ conflictNew = status.getConflictNewFile().getName();
if(status.getConflictNewFile()!=null){ conflictNew = status.getConflictNewFile().getName();
client.getStatusClient().doStatus(server.getTempDirectory(), SVNRevision.WORKING, SVNDepth.INFINITY, false, false, true, false, status -> { Assert.assertNull(status.getTreeConflict(), status.getFile().toString()); Assert.assertNull(status.getConflictNewFile(), status.getFile().toString()); }, changeLists); Assert.assertTrue(changeLists.isEmpty());