Examples with EditConflictsAction org.tigris.subversion.subclipse.ui.actions.EditConflictsAction used on opensource projects

Example 1 with EditConflictsAction

use of org.tigris.subversion.subclipse.ui.actions.EditConflictsAction in project subclipse by subclipse.

the class MergeResultsView method editConflicts.

private void editConflicts(MergeResult mergeResult) {
    IFile resource = (IFile) mergeResult.getResource();
    ISVNLocalResource svnResource = SVNWorkspaceRoot.getSVNResourceFor(resource);
    try {
        File conflictNewFile = svnResource.getStatus().getConflictNew();
        File conflictOldFile = svnResource.getStatus().getConflictOld();
        File conflictWorkingFile = svnResource.getStatus().getConflictWorking();
        File mergedFile = new File(resource.getLocation().toString());
        if (conflictWorkingFile == null) {
            EditConflictsAction editConflictsAction = new EditConflictsAction(resource);
            editConflictsAction.run(null);
        } else {
            MergeEditConflictsAction editConflictsAction = new MergeEditConflictsAction(conflictNewFile, conflictOldFile, conflictWorkingFile, mergedFile, resource.getName(), null);
            editConflictsAction.setMergeResult(mergeResult);
            editConflictsAction.run(null);
        }
    } catch (Exception e) {
    }
}