Package org.tmatesoft.svn.core.wc
Interface ISVNMergerFactory
-
- All Known Implementing Classes:
DefaultSVNOptions
public interface ISVNMergerFactory
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 onISVNOptions
andSVNWCUtil
.- Since:
- 1.2
- Version:
- 1.3
- See Also:
ISVNMerger
-
-
Method Summary
All Methods Instance Methods Abstract Methods Modifier and Type Method Description ISVNMerger
createMerger(byte[] conflictStart, byte[] conflictSeparator, byte[] conflictEnd)
Creates a new merger driver.
-
-
-
Method Detail
-
createMerger
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
andconflictSeparator
bytes, and the newcomer data between the specifiedconflictSeparator
andconflictEnd
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 conflictconflictSeparator
- bytes that are used to separate two conflicting fragments - local data and the newcomer oneconflictEnd
- bytes that come in the very end of a conflict- Returns:
- a merger driver
-
-