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