Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc.admin | |
org.tmatesoft.svn.core.internal.wc16 |
Modifier and Type | Field and Description |
---|---|
protected SVNMergeDriver |
SVNMergeCallback.myMergeDriver |
Constructor and Description |
---|
SVNMergeCallback(SVNAdminArea adminArea,
SVNURL url,
boolean force,
boolean dryRun,
SVNDiffOptions options,
java.util.Map conflictedPathsGetter,
SVNMergeDriver mergeDriver) |
SVNMergeCallback15(SVNAdminArea adminArea,
SVNURL url,
boolean force,
boolean dryRun,
SVNDiffOptions options,
java.util.Map conflictedPathsGetter,
SVNMergeDriver mergeDriver) |
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) |
Modifier and Type | Class and Description |
---|---|
class |
SVNDiffClient16
The SVNDiffClient class provides methods allowing to get differences
between versioned items ('diff' operation) as well as ones intended for
merging file contents.
|
Copyright © 2020. All rights reserved.