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 | Field and Description |
---|---|
private ISVNConflictHandler |
DefaultSVNMerger.myConflictCallback |
private ISVNConflictHandler |
DefaultSVNOptions.myConflictResolver |
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)
|
DefaultSVNMerger(byte[] start,
byte[] sep,
byte[] end,
ISVNConflictHandler callback,
SVNDiffConflictChoiceStyle style) |
Modifier and Type | Field and Description |
---|---|
ISVNConflictHandler |
SVNWCContext.ConflictStatusWalker.conflictHandler |
private ISVNConflictHandler |
SVNUpdateEditor17.myConflictHandler |
Modifier and Type | Method and Description |
---|---|
private SVNWCContext.MergePropStatusInfo |
SVNWCContext.applySingleGenericPropChange(SVNStatusType state,
java.io.File localAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean isDir,
SVNProperties workingProps,
java.lang.String propname,
SVNPropertyValue baseVal,
SVNPropertyValue oldVal,
SVNPropertyValue newVal,
ISVNConflictHandler conflictResolver,
boolean dryRun) |
private SVNWCContext.MergePropStatusInfo |
SVNWCContext.applySingleMergeinfoPropChange(SVNStatusType state,
java.io.File localAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean isDir,
SVNProperties workingProps,
java.lang.String propname,
SVNPropertyValue baseVal,
SVNPropertyValue oldVal,
SVNPropertyValue newVal,
ISVNConflictHandler conflictResolver,
boolean dryRun) |
(package private) SVNWCContext.MergePropStatusInfo |
SVNWCContext.applySinglePropAdd(SVNStatusType state,
java.io.File localAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean isDir,
SVNProperties workingProps,
java.lang.String propname,
SVNPropertyValue baseVal,
SVNPropertyValue toVal,
ISVNConflictHandler conflictResolver,
boolean dryRun) |
(package private) SVNWCContext.MergePropStatusInfo |
SVNWCContext.applySinglePropChange(SVNStatusType state,
java.io.File localAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean isDir,
SVNProperties workingProps,
java.lang.String propname,
SVNPropertyValue baseVal,
SVNPropertyValue oldVal,
SVNPropertyValue newVal,
ISVNConflictHandler conflictResolver,
boolean dryRun) |
(package private) SVNWCContext.MergePropStatusInfo |
SVNWCContext.applySinglePropDelete(SVNStatusType state,
java.io.File localAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean isDir,
SVNProperties workingProps,
java.lang.String propname,
SVNPropertyValue baseVal,
SVNPropertyValue oldVal,
ISVNConflictHandler conflictResolver,
boolean dryRun) |
static ISVNUpdateEditor |
SVNUpdateEditor17.createUpdateEditor(SVNWCContext context,
long targetRevision,
java.io.File anchorAbspath,
java.lang.String targetName,
java.util.Map<java.io.File,java.util.Map<java.lang.String,SVNProperties>> inheritableProperties,
boolean useCommitTimes,
SVNURL switchURL,
SVNDepth depth,
boolean depthIsSticky,
boolean allowUnversionedObstructions,
boolean addsAsModifications,
boolean serverPerformsFiltering,
boolean cleanCheckout,
ISVNDirFetcher dirFetcher,
SVNExternalsStore externalsStore,
java.lang.String[] preservedExtensions,
ISVNConflictHandler conflictHandler) |
private boolean |
SVNWCContext.generatePropConflict(java.io.File localAbsPath,
SVNOperation operation,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
java.lang.String propName,
SVNPropertyValue baseVal,
SVNPropertyValue workingVal,
SVNPropertyValue incomingOldVal,
SVNPropertyValue incomingNewVal,
ISVNConflictHandler conflictHandler) |
void |
SVNWCContext.invokeConflictResolver(java.io.File localAbsPath,
SVNSkel conflictSkel,
ISVNConflictHandler conflictHandler,
ISVNCanceller canceller) |
private boolean |
SVNWCContext.maybeGeneratePropConflict(java.io.File localAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean isDir,
java.lang.String propname,
SVNProperties workingProps,
SVNPropertyValue oldVal,
SVNPropertyValue newVal,
SVNPropertyValue baseVal,
SVNPropertyValue workingVal,
ISVNConflictHandler conflictResolver,
boolean dryRun) |
private SVNWCContext.MergeInfo |
SVNWCContext.maybeResolveConflicts(java.io.File leftAbspath,
java.io.File rightAbspath,
java.io.File targetAbspath,
java.io.File copyfromText,
java.lang.String leftLabel,
java.lang.String rightLabel,
java.lang.String targetLabel,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
java.io.File resultTarget,
java.io.File detranslatedTarget,
SVNPropertyValue mimeprop,
SVNDiffOptions options,
ISVNConflictHandler conflictResolver) |
SVNWCContext.MergePropertiesInfo |
SVNWCContext.mergeProperties(java.io.File localAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties baseProperties,
SVNProperties propChanges,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
SvnMergeResult |
DefaultSvnMerger.mergeProperties(ISvnMerger baseMerger,
java.io.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,
java.io.File localAbsPath,
ISVNWCDb.SVNWCDbKind kind,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNProperties serverBaseProperties,
SVNProperties pristineProperties,
SVNProperties actualProperties,
SVNProperties propChanges,
boolean baseMerge,
boolean dryRun,
ISVNConflictHandler conflictResolver) |
private void |
SVNWCContext.recursiveResolveConflict(java.io.File localAbsPath,
SVNDepth depth,
boolean resolveText,
java.lang.String resolveProps,
boolean resolveTree,
SVNConflictChoice conflictChoice,
ISVNConflictHandler conflictHandler) |
SVNWCContext.TextConflictResolutionInfo |
SVNWCContext.resolveTextConflict(java.io.File localAbsPath,
SVNOperation operation,
java.io.File leftAbsPath,
java.io.File rightAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
java.io.File resultTarget,
java.io.File detranslatedTarget,
ISVNConflictHandler conflictHandler) |
Modifier and Type | Class and Description |
---|---|
private static class |
SvnNgAbstractUpdate.RecordConflictsResolver |
Modifier and Type | Method and Description |
---|---|
private SvnNgMergeCallback2.MergeOutcome |
SvnNgMergeCallback2.merge(java.io.File leftAbsPath,
java.io.File rightAbsPath,
java.io.File targetAbsPath,
java.lang.String leftLabel,
java.lang.String rightLabel,
java.lang.String targetLabel,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
boolean dryRun,
java.lang.String diff3Cmd,
SVNDiffOptions mergeOptions,
SVNProperties originalProps,
SVNProperties propChanges,
boolean mergeContentNeeded,
boolean mergePropsNeeded,
ISVNConflictHandler conflictResolver) |
protected long |
SvnNgAbstractUpdate.updateInternal(SVNWCContext wcContext,
java.io.File localAbspath,
java.io.File anchorAbspath,
SVNRevision revision,
SVNDepth depth,
boolean depthIsSticky,
boolean ignoreExternals,
boolean allowUnversionedObstructions,
boolean addsAsMoodifications,
boolean sleepForTimestamp,
boolean notifySummary,
ISVNConflictHandler conflictHandler) |
Modifier and Type | Field and Description |
---|---|
private ISVNConflictHandler |
SVNClientImpl.mySVNConflictHandler |
Modifier and Type | Method and Description |
---|---|
protected ISVNConflictHandler |
SVNClientImpl.getConflictHandler() |
Modifier and Type | Field and Description |
---|---|
private ISVNConflictHandler |
SVNClientImpl.conflictHandler |
Modifier and Type | Method and Description |
---|---|
protected ISVNConflictHandler |
SVNClientImpl.getConflictHandler() |
private ISVNConflictHandler |
SVNClientImpl.getConflictHandler(ConflictResolverCallback callback) |
Modifier and Type | Method and Description |
---|---|
ISVNConflictHandler |
ISVNOptions.getConflictResolver() |
Modifier and Type | Method and Description |
---|---|
SvnMergeResult |
ISvnMerger.mergeProperties(ISvnMerger baseMerger,
java.io.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 |