Examples with SVNRevisionRange org.tmatesoft.svn.core.wc.SVNRevisionRange used on opensource projects

Example 1 with SVNRevisionRange

use of org.tmatesoft.svn.core.wc.SVNRevisionRange in project intellij-community by JetBrains.

the class BranchMerger method mergeNext.

public void mergeNext() throws VcsException {
    myAtStart = false;
    File destination = new File(myTargetPath);
    MergeClient client = myVcs.getFactory(destination).createMergeClient();
    SvnTarget source = SvnTarget.fromURL(mySourceUrl);
    if (mySupportsMergeInfo) {
        client.merge(source, destination, false, myReintegrate, createDiffOptions(), myHandler);
    } else {
        mySourceLatestRevision = resolveSourceLatestRevision();
        SVNRevisionRange range = new SVNRevisionRange(SVNRevision.create(mySourceCopyRevision), mySourceLatestRevision);
        client.merge(source, range, destination, Depth.UNKNOWN, false, false, true, createDiffOptions(), myHandler);
    }
}