Package | Description |
---|---|
org.tmatesoft.svn.cli.svn | |
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc17 | |
org.tmatesoft.svn.core.internal.wc2.ng | |
org.tmatesoft.svn.core.javahl |
This package provides an implementation of the native Subversion javahl
binding interface SVNClientInterface that is distributed within
the org.tigris.subversion.javahl package.
|
org.tmatesoft.svn.core.javahl17 | |
org.tmatesoft.svn.core.wc |
This package provides a high-level API for managing Working Copies in a way
compatible with the native SVN command line client.
|
org.tmatesoft.svn.core.wc2 |
NEW: this package contains command-style API to perform most of
Subversion operations on the level of abstraction similar to that of the
command line client.
|
Modifier and Type | Class and Description |
---|---|
class |
SVNCommandLineConflictHandler |
Modifier and Type | Method and Description |
---|---|
ISVNConflictHandler |
DefaultSVNOptions.getConflictResolver() |
Modifier and Type | Method and Description |
---|---|
void |
DefaultSVNOptions.setConflictHandler(ISVNConflictHandler resolver) |
Constructor and Description |
---|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end,
ISVNConflictHandler callback)
Deprecated.
|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end,
ISVNConflictHandler callback,
SVNDiffConflictChoiceStyle style) |
Modifier and Type | Method and Description |
---|---|
static ISVNUpdateEditor |
SVNUpdateEditor17.createUpdateEditor(SVNWCContext context,
long targetRevision,
File anchorAbspath,
String targetName,
Map<File,Map<String,SVNProperties>> inheritableProperties,
boolean useCommitTimes,
SVNURL switchURL,
SVNDepth depth,
boolean depthIsSticky,
boolean allowUnversionedObstructions,
boolean addsAsModifications,
boolean serverPerformsFiltering,
boolean cleanCheckout,
ISVNDirFetcher dirFetcher,
SVNExternalsStore externalsStore,
String[] preservedExtensions,
ISVNConflictHandler conflictHandler) |
void |
SVNWCContext.invokeConflictResolver(File localAbsPath,
SVNSkel conflictSkel,
ISVNConflictHandler conflictHandler,
ISVNCanceller canceller) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties(File localAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties baseProperties,
SVNProperties propChanges,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SvnMergeResult |
DefaultSvnMerger.mergeProperties(ISvnMerger baseMerger,
File localAbsPath,
SVNNodeKind kind,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties serverBaseProperties,
SVNProperties pristineProperties,
SVNProperties actualProperties,
SVNProperties propChanges,
boolean baseMerge,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties2(SVNWCContext.MergePropertiesInfo mergeInfo,
File localAbsPath,
ISVNWCDb.SVNWCDbKind kind,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties serverBaseProperties,
SVNProperties pristineProperties,
SVNProperties actualProperties,
SVNProperties propChanges,
boolean baseMerge,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
org.tmatesoft.svn.core.internal.wc17.SVNWCContext.TextConflictResolutionInfo |
SVNWCContext.resolveTextConflict(File localAbsPath,
SVNOperation operation,
File leftAbsPath,
File rightAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
File resultTarget,
File detranslatedTarget,
ISVNConflictHandler conflictHandler) |
Modifier and Type | Method and Description |
---|---|
protected long |
SvnNgAbstractUpdate.updateInternal(SVNWCContext wcContext,
File localAbspath,
File anchorAbspath,
SVNRevision revision,
SVNDepth depth,
boolean depthIsSticky,
boolean ignoreExternals,
boolean allowUnversionedObstructions,
boolean addsAsMoodifications,
boolean sleepForTimestamp,
boolean notifySummary,
ISVNConflictHandler conflictHandler) |
Modifier and Type | Method and Description |
---|---|
protected ISVNConflictHandler |
SVNClientImpl.getConflictHandler() |
Modifier and Type | Method and Description |
---|---|
protected ISVNConflictHandler |
SVNClientImpl.getConflictHandler() |
Modifier and Type | Method and Description |
---|---|
ISVNConflictHandler |
ISVNOptions.getConflictResolver() |
Modifier and Type | Method and Description |
---|---|
SvnMergeResult |
ISvnMerger.mergeProperties(ISvnMerger baseMerger,
File localAbsPath,
SVNNodeKind kind,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties serverBaseProperties,
SVNProperties pristineProperties,
SVNProperties actualProperties,
SVNProperties propChanges,
boolean baseMerge,
boolean dryRun,
ISVNConflictHandler conflictResolver)
Merges the property changes
propChanges based on serverBaseProperties
into the working copy localAbsPath |
Copyright © 2022. All rights reserved.