| org.tmatesoft.svn.core.wc.ISVNMergerFactory
All known Subclasses: org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions,
ISVNMergerFactory | public interface ISVNMergerFactory (Code) | | The ISVNMergerFactory interface should be implemented in
order to be used as a factory of merger drivers intended for
merging operations.
To get a default merger factory implementation call the
ISVNOptions.getMergerFactory method of a default run-time
configuration driver. How to obtain a default run-time configuration
driver read more on
ISVNOptions and
SVNWCUtil .
version: 1.1.1 author: TMate Software Ltd. See Also: ISVNMerger |
Method Summary | |
public ISVNMerger | createMerger(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd) Creates a new merger driver.
If a merger driver can not cleanly apply delta to a file (in case of a conflict state)
then for each conflicting contents fragment the driver puts local data between the
specified conflictStart and conflictSeparator bytes, and the newcomer
data between the specified conflictSeparator and conflictEnd ones. |
createMerger | public ISVNMerger createMerger(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd)(Code) | | Creates a new merger driver.
If a merger driver can not cleanly apply delta to a file (in case of a conflict state)
then for each conflicting contents fragment the driver puts local data between the
specified conflictStart and conflictSeparator bytes, and the newcomer
data between the specified conflictSeparator and conflictEnd ones.
And all these bytes are then written to the file in the place of a conflict.
Parameters: conflictStart - bytes that come in the very beginning of a conflict Parameters: conflictSeparator - bytes that are used to separate two conflicting fragments - local data and the newcomer one Parameters: conflictEnd - bytes that come in the very end of a conflict a merger driver |
|
|