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
-
-
Constructor Summary
Constructors Constructor Description DefaultSvnMerger(SVNWCContext context)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description SVNSkel
getWorkItems()
SVNMergeResult
mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun)
GivenadminArea
/localPath
and property changes (propDiff
) based onserverBaseProps
, merges the changes into the working copy.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)
Merges the property changespropChanges
based onserverBaseProperties
into the working copylocalAbsPath
SVNMergeResult
mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
Performs a text merge.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)
Performs a text merge.
-
-
-
Constructor Detail
-
DefaultSvnMerger
public DefaultSvnMerger(SVNWCContext context)
-
-
Method Detail
-
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 interfaceISVNMerger
- Parameters:
files
- files invoked in mergedryRun
- if true, merge is simulated only, no real changes are doneoptions
- 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
GivenadminArea
/localPath
and property changes (propDiff
) based onserverBaseProps
, merges the changes into the working copy.- Specified by:
mergeProperties
in interfaceISVNMerger
- Parameters:
localPath
- working copy path base nameworkingProperties
- working propertiesbaseProperties
- pristine propertiesserverBaseProps
- properties that come from the serverpropDiff
- property changes that come from the repositoryadminArea
- admin area object representing the.svn<./code> admin area of the target which properties are merged
log
- loggerbaseMerge
- if false, then changes only working properties; otherwise, changes both the base and working propertiesdryRun
- 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 interfaceISvnMerger
targetAbspath
- working copy absolute path of the targetoptions
- 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 changespropChanges
based onserverBaseProperties
into the working copylocalAbsPath
- Specified by:
mergeProperties
in interfaceISvnMerger
localAbsPath
- working copy absolute pathkind
- node kindserverBaseProperties
- properties that come from the serverpristineProperties
- pristine propertiesactualProperties
- actual (working) propertiespropChanges
- property changes that come from the repositorybaseMerge
- iffalse
, then changes only working properties; otherwise, changes both the base and working propertiesdryRun
- iftrue
, merge is simulated only, no real changes are done- Returns:
- result of merging
- Throws:
SVNException
-
-