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

Example 1 with QuickMergeInteractionImpl

use of org.jetbrains.idea.svn.integrate.QuickMergeInteractionImpl 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);
}