Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc.admin |
Modifier and Type | Class and Description |
---|---|
class |
SVNMergeCallback15 |
Modifier and Type | Method and Description |
---|---|
ISVNReusableEditor |
SVNMergeDriver.driveMergeReportEditor(java.io.File targetWCPath,
SVNURL url1,
long revision1,
SVNURL url2,
long revision2,
java.util.List childrenWithMergeInfo,
boolean isRollBack,
SVNDepth depth,
SVNAdminArea adminArea,
SVNMergeCallback mergeCallback,
ISVNReusableEditor editor) |
ISVNReusableEditor |
ISVNMergeStrategy.driveMergeReportEditor(java.io.File targetWCPath,
SVNURL url1,
long revision1,
SVNURL url2,
long revision2,
java.util.List childrenWithMergeInfo,
boolean isRollBack,
SVNDepth depth,
SVNAdminArea adminArea,
SVNMergeCallback mergeCallback,
ISVNReusableEditor editor) |
Modifier and Type | Method and Description |
---|---|
SVNMergeCallback |
SVNWCAccess.createMergeCallback(SVNMergeDriver mergeDriver,
SVNAdminArea adminArea,
SVNURL url,
SVNDiffOptions mergeOptions,
java.util.Map conflictedPaths,
boolean force,
boolean dryRun) |
Copyright © 2020. All rights reserved.