Examples of org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge()

Class org.tmatesoft.svn.core.wc.SVNDiffClient

Examples of org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge()

org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge()
Applies the differences between two sources (using Working Copy paths to get corresponding URLs of the sources) to a Working Copy path.
Corresponds to the SVN command line client's 'svn merge sourceWCPATH1@rev1 sourceWCPATH2@rev2 WCPATH' command.
If you need only to try merging your file(s) without actual merging, you should set dryRun to true. Your event handler will be dispatched status type information on the target path(s). If a path can be successfully merged, the status type will be {@link SVNStatusType#MERGED} for that path. @param path1 the first source path @param revision1 a revision of path1 @param path2 the second source path which URL is to be comparedagainst the URL of path1 @param revision2 a revision of path2 @param dstPath the target path to which the result shouldbe applied @param recursive true to descend recursively @param useAncestry if true thenthe paths ancestry will be noticed while calculating differences, otherwise not @param force true toforce the operation to run @param dryRun if true thenonly tries the operation to run (to find out if a file can be merged successfully) @throws SVNException if one of the following is true:
- at least one of revision1 and revision2 is invalid
- path1 has no URL
- path2 has no URL
- the repository location of path1 was not found in revision1
- the repository location of path2 was not found in revision2
- dstPath is not under version control
@deprecated use {@link #doMerge(File,SVNRevision,File,SVNRevision,File,SVNDepth,boolean,boolean,boolean,boolean)}instead

                        rangesToMerge,
                        new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth),
                        !ignoreAncestry, force, dryRun, recordOnly);
            } else {
                differ.doMerge(new File(path).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNRevision(pegRevision),
                        rangesToMerge,
                        new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth),
                        !ignoreAncestry, force, dryRun, recordOnly);

View Full Code Here

        SVNDiffClient differ = getSVNDiffClient();
        try {
            if (isURL(path1) && isURL(path2)) {
                SVNURL url1 = SVNURL.parseURIEncoded(path1);
                SVNURL url2 = SVNURL.parseURIEncoded(path2);
                differ.doMerge(url1, JavaHLObjectFactory.getSVNRevision(revision1), url2,
                        JavaHLObjectFactory.getSVNRevision(revision2), new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth), !ignoreAncestry, force, dryRun, recordOnly);
            } else if (isURL(path1)) {
                SVNURL url1 = SVNURL.parseURIEncoded(path1);
                File file2 = new File(path2).getAbsoluteFile();

View Full Code Here

                        JavaHLObjectFactory.getSVNRevision(revision2), new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth), !ignoreAncestry, force, dryRun, recordOnly);
            } else if (isURL(path1)) {
                SVNURL url1 = SVNURL.parseURIEncoded(path1);
                File file2 = new File(path2).getAbsoluteFile();
                differ.doMerge(url1, JavaHLObjectFactory.getSVNRevision(revision1), file2,
                        JavaHLObjectFactory.getSVNRevision(revision2), new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth), !ignoreAncestry, force, dryRun, recordOnly);
            } else if (isURL(path2)) {
                SVNURL url2 = SVNURL.parseURIEncoded(path2);
                File file1 = new File(path1).getAbsoluteFile();

View Full Code Here

                        JavaHLObjectFactory.getSVNRevision(revision2), new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth), !ignoreAncestry, force, dryRun, recordOnly);
            } else if (isURL(path2)) {
                SVNURL url2 = SVNURL.parseURIEncoded(path2);
                File file1 = new File(path1).getAbsoluteFile();
                differ.doMerge(file1, JavaHLObjectFactory.getSVNRevision(revision1), url2,
                        JavaHLObjectFactory.getSVNRevision(revision2), new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth), !ignoreAncestry, force, dryRun, recordOnly);
            } else {
                File file1 = new File(path1).getAbsoluteFile();
                File file2 = new File(path2).getAbsoluteFile();

View Full Code Here

                        JavaHLObjectFactory.getSVNRevision(revision2), new File(localPath).getAbsoluteFile(),
                        JavaHLObjectFactory.getSVNDepth(depth), !ignoreAncestry, force, dryRun, recordOnly);
            } else {
                File file1 = new File(path1).getAbsoluteFile();
                File file2 = new File(path2).getAbsoluteFile();
                differ.doMerge(file1, JavaHLObjectFactory.getSVNRevision(revision1),
                        file2, JavaHLObjectFactory.getSVNRevision(revision2),
                        new File(localPath).getAbsoluteFile(), JavaHLObjectFactory.getSVNDepth(depth),
                        !ignoreAncestry, force, dryRun, recordOnly);
            }
        } catch (SVNException e) {

View Full Code Here

        File targetOfMerge = (mergeToDMO? demoDir: customDir); 
        SVNURL sourceOfMerge = (mergeToDMO? customURL : demoURL);
        SVNRevisionRange rangeToMerge = new SVNRevisionRange(SVNRevision.create(revAfterCopyToCustom), SVNRevision.HEAD);        
        wcFilesNotMerged.clear();
                
        diffClient.doMerge(sourceOfMerge, SVNRevision.create(revAfterCopyToCustom), Collections.singleton(rangeToMerge), 
                targetOfMerge, SVNDepth.INFINITY, true, false, false, false);
                
        logger.info("Finished merging");


        /*

View Full Code Here

                        client.doMergeReIntegrate(source1.getFile(), pegRevision1, target.getFile(), 
                                getSVNEnvironment().isDryRun());
                    }
                } else {
                    if (source1.isURL()) {
                        client.doMerge(source1.getURL(), pegRevision1, rangesToMerge, target.getFile(), 
                                getSVNEnvironment().getDepth(), !getSVNEnvironment().isIgnoreAncestry(), 
                                getSVNEnvironment().isForce(), getSVNEnvironment().isDryRun(), 
                                getSVNEnvironment().isRecordOnly());
                    } else {
                        client.doMerge(source1.getFile(), pegRevision1, rangesToMerge, target.getFile(),

View Full Code Here

                        client.doMerge(source1.getURL(), pegRevision1, rangesToMerge, target.getFile(), 
                                getSVNEnvironment().getDepth(), !getSVNEnvironment().isIgnoreAncestry(), 
                                getSVNEnvironment().isForce(), getSVNEnvironment().isDryRun(), 
                                getSVNEnvironment().isRecordOnly());
                    } else {
                        client.doMerge(source1.getFile(), pegRevision1, rangesToMerge, target.getFile(), 
                                getSVNEnvironment().getDepth(), !getSVNEnvironment().isIgnoreAncestry(), 
                                getSVNEnvironment().isForce(), getSVNEnvironment().isDryRun(), 
                                getSVNEnvironment().isRecordOnly());
                    }
                }

View Full Code Here

                                getSVNEnvironment().isRecordOnly());
                    }
                }
            } else {
                if (source1.isURL() && source2.isURL()) {
                    client.doMerge(source1.getURL(), firstRangeStart, source2.getURL(), firstRangeEnd, 
                        target.getFile(), getSVNEnvironment().getDepth(), 
                        !getSVNEnvironment().isIgnoreAncestry(), getSVNEnvironment().isForce(), 
                        getSVNEnvironment().isDryRun(), getSVNEnvironment().isRecordOnly());
                } else if (source1.isURL() && source2.isFile()) {
                    client.doMerge(source1.getURL(), firstRangeStart, source2.getFile(), firstRangeEnd,

View Full Code Here

                    client.doMerge(source1.getURL(), firstRangeStart, source2.getURL(), firstRangeEnd, 
                        target.getFile(), getSVNEnvironment().getDepth(), 
                        !getSVNEnvironment().isIgnoreAncestry(), getSVNEnvironment().isForce(), 
                        getSVNEnvironment().isDryRun(), getSVNEnvironment().isRecordOnly());
                } else if (source1.isURL() && source2.isFile()) {
                    client.doMerge(source1.getURL(), firstRangeStart, source2.getFile(), firstRangeEnd, 
                        target.getFile(), getSVNEnvironment().getDepth(), 
                        !getSVNEnvironment().isIgnoreAncestry(), getSVNEnvironment().isForce(), 
                        getSVNEnvironment().isDryRun(), getSVNEnvironment().isRecordOnly());
                } else if (source1.isFile() && source2.isURL()) {
                    client.doMerge(source1.getFile(), firstRangeStart, source2.getURL(), firstRangeEnd,

View Full Code Here

0 1 2 3

TOP

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.