Class DefaultSvnMerger

java.lang.Object
org.tmatesoft.svn.core.internal.wc17.DefaultSvnMerger
All Implemented Interfaces:
ISVNMerger, ISvnMerger

public class DefaultSvnMerger extends java.lang.Object implements ISvnMerger
  • Field Details

  • Constructor Details

    • DefaultSvnMerger

      public DefaultSvnMerger(SVNWCContext context)
  • Method Details

    • getWorkItems

      public SVNSkel getWorkItems()
    • mergeText

      public SVNMergeResult mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options) throws SVNException
      Description copied from interface: ISVNMerger
      Performs a text merge.
      Specified by:
      mergeText in interface ISVNMerger
      Parameters:
      files - files invoked in merge
      dryRun - if true, merge is simulated only, no real changes are done
      options - merge options to take into account
      Returns:
      result of merging
      Throws:
      SVNException
    • mergeProperties

      public SVNMergeResult mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun) throws SVNException
      Description copied from interface: ISVNMerger
      Given adminArea/localPath and property changes (propDiff) based on serverBaseProps, merges the changes into the working copy.
      Specified by:
      mergeProperties in interface ISVNMerger
      Parameters:
      localPath - working copy path base name
      workingProperties - working properties
      baseProperties - pristine properties
      serverBaseProps - properties that come from the server
      propDiff - property changes that come from the repository
      adminArea - admin area object representing the .svn<./code> admin area of the target which properties are merged
      log - logger
      baseMerge - if false, then changes only working properties; otherwise, changes both the base and working properties
      dryRun - if true, merge is simulated only, no real changes are done
      Returns:
      result of merging
      Throws:
      SVNException
    • mergeText

      public SvnMergeResult mergeText(ISvnMerger baseMerger, java.io.File resultFile, java.io.File targetAbspath, java.io.File detranslatedTargetAbspath, java.io.File leftAbspath, java.io.File rightAbspath, java.lang.String targetLabel, java.lang.String leftLabel, java.lang.String rightLabel, SVNDiffOptions options, SVNDiffConflictChoiceStyle style) throws SVNException
      Description copied from interface: ISvnMerger
      Performs a text merge.
      Specified by:
      mergeText in interface ISvnMerger
      targetAbspath - working copy absolute path of the target
      options - merge options to take into account
      Returns:
      result of merging
      Throws:
      SVNException
    • mergeProperties

      public SvnMergeResult mergeProperties(ISvnMerger baseMerger, java.io.File localAbsPath, SVNNodeKind kind, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties serverBaseProperties, SVNProperties pristineProperties, SVNProperties actualProperties, SVNProperties propChanges, boolean baseMerge, boolean dryRun, ISVNConflictHandler conflictResolver) throws SVNException
      Description copied from interface: ISvnMerger
      Merges the property changes propChanges based on serverBaseProperties into the working copy localAbsPath
      Specified by:
      mergeProperties in interface ISvnMerger
      localAbsPath - working copy absolute path
      kind - node kind
      serverBaseProperties - properties that come from the server
      pristineProperties - pristine properties
      actualProperties - actual (working) properties
      propChanges - property changes that come from the repository
      baseMerge - if false, then changes only working properties; otherwise, changes both the base and working properties
      dryRun - if true, merge is simulated only, no real changes are done
      Returns:
      result of merging
      Throws:
      SVNException