Package org.tmatesoft.svn.core.wc
Interface ISVNMerger
-
- All Known Subinterfaces:
ISvnMerger
- All Known Implementing Classes:
AbstractSVNMerger
,DefaultSvnMerger
,DefaultSVNMerger
public interface ISVNMerger
ISVNMerger is the merge driver interface used bySVNKit
in merging operations.Merge drivers are created by a merger factory implementing the
ISVNMergerFactory
interface. Read more about that interface to find out how to get a default implementation ofISVNMerger
. Note: methods of this interface will only be called for Subversion 1.6 or older working copies. To provide custom merge implementation for Subversion 1.7 working copies implementISvnMerger
interface.- Since:
- 1.2
- Version:
- 1.3
- Author:
- TMate Software Ltd.
-
-
Method Summary
All Methods Instance Methods Abstract Methods Modifier and Type Method Description 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
mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
Performs a text merge.
-
-
-
Method Detail
-
mergeText
SVNMergeResult mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options) throws SVNException
Performs a text merge.- 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
SVNMergeResult mergeProperties(java.lang.String localPath, SVNProperties workingProperties, SVNProperties baseProperties, SVNProperties serverBaseProps, SVNProperties propDiff, SVNAdminArea adminArea, SVNLog log, boolean baseMerge, boolean dryRun) throws SVNException
GivenadminArea
/localPath
and property changes (propDiff
) based onserverBaseProps
, merges the changes into the working copy.- 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
-
-