Interface ISVNMergeStrategy
- All Known Implementing Classes:
SVNDiffClient16
,SVNMergeDriver
public interface ISVNMergeStrategy
The ISVNMergeStrategy interface defines a number of methods
to be used for directories merging.
Alternative implementation is extended merge feature, it tracks
copied and moved files to apply appropriate deltas to them.
See svnkit-ext package
- Version:
- 1.3
-
Method Summary
Modifier and TypeMethodDescriptioncalculateImplicitMergeInfo
(SVNRepository repos, SVNURL url, long[] targetRev, long start, long end) Object[]
calculateRemainingRangeList
(File targetFile, SVNEntry entry, SVNURL sourceRoot, boolean[] indirect, SVNURL url1, long revision1, SVNURL url2, long revision2, SVNMergeRange range) driveMergeReportEditor
(File targetWCPath, SVNURL url1, long revision1, SVNURL url2, long revision2, List childrenWithMergeInfo, boolean isRollBack, SVNDepth depth, SVNAdminArea adminArea, SVNMergeCallback mergeCallback, ISVNReusableEditor editor) getMergeInfoEntryHandler
(String mergeSrcPath, SVNURL sourceRootURL, long revision1, long revision2, SVNRepository repository, SVNDepth depth, List childrenWithMergeInfo) getMergeReportEditor
(long defaultStart, long revision, SVNAdminArea adminArea, SVNDepth depth, AbstractDiffCallback mergeCallback, ISVNReusableEditor editor) boolean
-
Method Details
-
getMergeReportEditor
ISVNReusableEditor getMergeReportEditor(long defaultStart, long revision, SVNAdminArea adminArea, SVNDepth depth, AbstractDiffCallback mergeCallback, ISVNReusableEditor editor) throws SVNException - Throws:
SVNException
-
driveMergeReportEditor
ISVNReusableEditor driveMergeReportEditor(File targetWCPath, SVNURL url1, long revision1, SVNURL url2, long revision2, List childrenWithMergeInfo, boolean isRollBack, SVNDepth depth, SVNAdminArea adminArea, SVNMergeCallback mergeCallback, ISVNReusableEditor editor) throws SVNException - Throws:
SVNException
-
getMergeInfoEntryHandler
ISVNEntryHandler getMergeInfoEntryHandler(String mergeSrcPath, SVNURL sourceRootURL, long revision1, long revision2, SVNRepository repository, SVNDepth depth, List childrenWithMergeInfo) -
isRecordMergeInfo
boolean isRecordMergeInfo() -
calculateRemainingRangeList
Object[] calculateRemainingRangeList(File targetFile, SVNEntry entry, SVNURL sourceRoot, boolean[] indirect, SVNURL url1, long revision1, SVNURL url2, long revision2, SVNMergeRange range) throws SVNException - Throws:
SVNException
-
calculateImplicitMergeInfo
Map calculateImplicitMergeInfo(SVNRepository repos, SVNURL url, long[] targetRev, long start, long end) throws SVNException - Throws:
SVNException
-