void () { assertNull(createTestFailedComment(conflictFile.getPath()) + " tree conflict resolved", SvnUtil.getStatus(vcs, conflictFile.getIOFile()).getTreeConflict()); for (TreeConflictData.FileData file : conflictData.getLeftFiles()) { File exFile = new File(myWorkingCopyDir.getPath(), file.myRelativePath); final Status status = SvnUtil.getStatus(vcs, exFile); boolean theirsExists = new File(myTheirs.getPath(), file.myRelativePath).exists(); if (STATUS_UNVERSIONED.equals(file.myNodeStatus)) { assertTrue(createTestFailedComment(exFile.getPath()) + " (file exists)", exFile.exists()); if (theirsExists) { // should be deleted assertTrue(createTestFailedComment(exFile.getPath()) + " (unversioned)", status == null || status.is(STATUS_DELETED)); } else { // unversioned assertTrue(createTestFailedComment(exFile.getPath()) + " (unversioned)", status == null || status.is(STATUS_UNVERSIONED)); } } else if (STATUS_DELETED.equals(file.myNodeStatus)) { assertTrue(createTestFailedComment(exFile.getPath()) + " (deleted status)", status != null && status.is(file.myNodeStatus)); } else if (STATUS_ADDED.equals(file.myNodeStatus)) { assertTrue(createTestFailedComment(exFile.getPath()) + " (file exists)", exFile.exists()); if (theirsExists) { assertTrue(createTestFailedComment(exFile.getPath()) + " (added status)", status != null && status.is(STATUS_REPLACED)); } else { assertTrue(createTestFailedComment(exFile.getPath()) + " (added status)", status != null && status.is(STATUS_ADDED)); } } else { if (status.is(STATUS_ADDED)) { // in theirs -> deleted assertFalse(createTestFailedComment(file.myRelativePath) + " check deleted in theirs", theirsExists); } else { if (theirsExists) { assertTrue(createTestFailedComment(exFile.getPath()) + " (normal node status)", status != null && status.is(STATUS_REPLACED)); } else { assertTrue(createTestFailedComment(exFile.getPath()) + " (normal node status)", status != null && status.is(STATUS_NORMAL, STATUS_MODIFIED)); } } if (file.myCopyFrom != null) { assertTrue(createTestFailedComment(exFile.getPath()) + " (copied status)", status != null && file.myCopyFrom.equals(getRelativeUrl(myRepositoryUrl, status.getCopyFromUrl()))); } else { assertTrue(createTestFailedComment(exFile.getPath()) + " (modified text status)", status != null && status.is(file.myContentsStatus)); } } } }