Examples with QuickMerge org.jetbrains.idea.svn.integrate.QuickMerge used on opensource projects

Example 1 with QuickMerge

use of org.jetbrains.idea.svn.integrate.QuickMerge in project intellij-community by JetBrains.

the class SvnQuickMergeTest method waitQuickMerge.

private void waitQuickMerge(@NotNull String sourceUrl, @NotNull QuickMergeTestInteraction interaction) throws Exception {
    MergeContext mergeContext = new MergeContext(myVcs, sourceUrl, getWcInfo(), SVNPathUtil.tail(sourceUrl), myWorkingCopyDir);
    QuickMerge quickMerge = new QuickMerge(mergeContext, interaction);
    getApplication().invokeAndWait(quickMerge::execute);
    quickMerge.waitForTasksToFinish();
    interaction.throwIfExceptions();
}

Example 2 with QuickMerge

use of org.jetbrains.idea.svn.integrate.QuickMerge in project intellij-community by JetBrains.

the class CopiesPanel method mergeFrom.

private void mergeFrom(@NotNull final WCInfo wcInfo, @NotNull final VirtualFile root, @Nullable final Component mergeLabel) {
    SelectBranchPopup.showForBranchRoot(myProject, root, (project, configuration, branchUrl, revision) -> {
        String workingCopyUrlInSelectedBranch = getCorrespondingUrlInOtherBranch(configuration, wcInfo.getUrl(), branchUrl);
        MergeContext mergeContext = new MergeContext(myVcs, workingCopyUrlInSelectedBranch, wcInfo, SVNPathUtil.tail(branchUrl), root);
        new QuickMerge(mergeContext, new QuickMergeInteractionImpl(mergeContext)).execute();
    }, "Select branch", mergeLabel);
}