public class DefaultSvnMerger extends java.lang.Object implements ISvnMerger
Constructor and Description |
---|
DefaultSvnMerger(SVNWCContext context) |
Modifier and Type | Method and Description |
---|---|
SVNSkel |
getWorkItems() |
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 changes
propChanges based on serverBaseProperties
into the working copy localAbsPath |
SVNMergeResult |
mergeProperties(java.lang.String localPath,
SVNProperties workingProperties,
SVNProperties baseProperties,
SVNProperties serverBaseProps,
SVNProperties propDiff,
SVNAdminArea adminArea,
SVNLog log,
boolean baseMerge,
boolean dryRun)
Given
adminArea /localPath and property changes (propDiff ) based
on serverBaseProps , merges the changes into the working copy. |
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.
|
SVNMergeResult |
mergeText(SVNMergeFileSet files,
boolean dryRun,
SVNDiffOptions options)
Performs a text merge.
|
public DefaultSvnMerger(SVNWCContext context)
public SVNSkel getWorkItems()
public SVNMergeResult mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options) throws SVNException
ISVNMerger
mergeText
in interface ISVNMerger
files
- files invoked in mergedryRun
- if true, merge is simulated only, no real
changes are doneoptions
- merge options to take into accountSVNException
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
ISVNMerger
adminArea
/localPath
and property changes (propDiff
) based
on serverBaseProps
, merges the changes into the working copy.mergeProperties
in interface ISVNMerger
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 doneSVNException
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
ISvnMerger
mergeText
in interface ISvnMerger
targetAbspath
- working copy absolute path of the targetoptions
- merge options to take into accountSVNException
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
ISvnMerger
propChanges
based on serverBaseProperties
into the working copy localAbsPath
mergeProperties
in interface ISvnMerger
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
- 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 doneSVNException
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.