public SVNStatusType mergeProperties(String name, SVNProperties serverBaseProps, SVNProperties baseProps, SVNProperties workingProps, SVNProperties propDiff, String localLabel, String latestLabel, boolean baseMerge, boolean dryRun, SVNLog log) throws SVNException { localLabel = localLabel == null ? "(modified)" : localLabel; latestLabel = latestLabel == null ? "(latest)" : latestLabel; 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); return result.getMergeStatus(); }
public SVNStatusType mergeProperties(String name, SVNProperties serverBaseProps, SVNProperties baseProps, SVNProperties workingProps, SVNProperties propDiff, String localLabel, String latestLabel, boolean baseMerge, boolean dryRun, SVNLog log) throws SVNException { localLabel = localLabel == null ? "(modified)" : localLabel; latestLabel = latestLabel == null ? "(latest)" : latestLabel; 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); return result.getMergeStatus(); }
public SVNStatusType mergeProperties(String name, SVNProperties serverBaseProps, SVNProperties baseProps, SVNProperties workingProps, SVNProperties propDiff, String localLabel, String latestLabel, boolean baseMerge, boolean dryRun, SVNLog log) throws SVNException { localLabel = localLabel == null ? "(modified)" : localLabel; latestLabel = latestLabel == null ? "(latest)" : latestLabel; 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); return result.getMergeStatus(); }