void (final boolean wasCanceled) { if (! myRecentlyUpdatedFiles.isEmpty()) { myResolveWorker.execute(myRecentlyUpdatedFiles); } final boolean haveConflicts = ResolveWorker.haveUnresolvedConflicts(myRecentlyUpdatedFiles); accumulate(); if ((!myMerger.hasNext()) || haveConflicts || (!myExceptions.isEmpty()) || myAccumulatedFiles.containErrors() || wasCanceled) { initMergeTarget(); if (myAccumulatedFiles.isEmpty() && myExceptions.isEmpty() && (myMergeTarget == null) && (!wasCanceled)) { Messages.showMessageDialog(message("action.Subversion.integrate.changes.message.files.up.to.date.text"), getTitle(), Messages.getInformationIcon()); } else { if (haveConflicts) { myExceptions.add(createException(true, message("svn.integrate.changelist.warning.unresolved.conflicts.text"))); } if (wasCanceled) { myExceptions.add(createException(true, message("error.integration.was.canceled"), myMerger.getSkipped())); } finishActions(wasCanceled); } myMerger.afterProcessing(); } else { stepToNextChangeList(); } }