Examples of org.exist.versioning.svn.wc.ISVNMergerFactory

org.exist.versioning.svn.wc.ISVNMergerFactory
The ISVNMergerFactory interface should be implemented in order to be used as a factory of merger drivers intended for merging operations.
To get a default merger factory implementation call the {@link ISVNOptions#getMergerFactory()} method of a default run-timeconfiguration driver. How to obtain a default run-time configuration driver read more on {@link ISVNOptions} and {@link SVNWCUtil}. @version 1.3 @author TMate Software Ltd. @since 1.2 @see ISVNMerger

            if (entry.getConflictOld() != null && entry.getConflictNew() != null && entry.getConflictWorking() != null) {
                String conflictOld = entry.getConflictOld();
                String conflictNew = entry.getConflictNew();
                String conflictWorking = entry.getConflictWorking();
                
                ISVNMergerFactory factory = myWCAccess.getOptions().getMergerFactory();
                
                File conflictOldFile = SVNPathUtil.isAbsolute(conflictOld) ? new Resource(conflictOld) : getFile(conflictOld);
                File conflictNewFile = SVNPathUtil.isAbsolute(conflictNew) ? new Resource(conflictNew) : getFile(conflictNew);
                File conflictWorkingFile = SVNPathUtil.isAbsolute(conflictWorking) ? new Resource(conflictWorking) : getFile(conflictWorking);
                    
                byte[] conflictStart = ("<<<<<<< " + conflictWorking).getBytes();
                byte[] conflictEnd = (">>>>>>> " + conflictNew).getBytes();
                byte[] separator = ("=======").getBytes();


                ISVNMerger merger = factory.createMerger(conflictStart, separator, conflictEnd);
                SVNDiffConflictChoiceStyle style = conflictChoice == SVNConflictChoice.THEIRS_CONFLICT ? SVNDiffConflictChoiceStyle.CHOOSE_LATEST : 
                    SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED;
                if (merger instanceof DefaultSVNMerger) {
                    DefaultSVNMerger defaultMerger = (DefaultSVNMerger) merger;
                    defaultMerger.setDiffConflictStyle(style);

View Full Code Here


        byte[] conflictStart = ("<<<<<<< " + localLabel).getBytes();
        byte[] conflictEnd = (">>>>>>> " + latestLabel).getBytes();
        byte[] separator = ("=======").getBytes();
        
        ISVNMergerFactory factory = myWCAccess.getOptions().getMergerFactory();
        ISVNMerger merger = factory.createMerger(conflictStart, separator, conflictEnd);
        propDiff = propDiff == null ? new SVNProperties() : propDiff;


        SVNMergeResult result = merger.mergeProperties(name, workingProps, baseProps, serverBaseProps, 
                propDiff, this, log, baseMerge, dryRun);

View Full Code Here

        latestLabel = latestLabel == null ? ".new" : latestLabel;


        byte[] conflictStart = ("<<<<<<< " + localLabel).getBytes();
        byte[] conflictEnd = (">>>>>>> " + latestLabel).getBytes();
        byte[] separator = ("=======").getBytes();
        ISVNMergerFactory factory = myWCAccess.getOptions().getMergerFactory();
        ISVNMerger merger = factory.createMerger(conflictStart, separator, conflictEnd);


        String workingText = localPath;
        if (copyFromText != null) {
            String copyFromTextPath = copyFromText.getAbsolutePath().replace(File.separatorChar, '/');
            String thisPath = getRoot().getAbsolutePath().replace(File.separatorChar, '/');

View Full Code Here

TOP

Related Classes of org.exist.versioning.svn.wc.ISVNMergerFactory

org.exist.versioning.svn.internal.wc.admin.SVNAdminArea

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.