Uses of Interface
org.tmatesoft.svn.core.wc.ISVNConflictHandler
Packages that use ISVNConflictHandler
Package
Description
This package provides an implementation of the native Subversion javahl
binding interface SVNClientInterface that is distributed within
the org.tigris.subversion.javahl package.
This package provides a high-level API for managing Working Copies in a way
compatible with the native SVN command line client.
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.
-
Uses of ISVNConflictHandler in org.tmatesoft.svn.cli.svn
Classes in org.tmatesoft.svn.cli.svn that implement ISVNConflictHandler -
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.internal.wc
Fields in org.tmatesoft.svn.core.internal.wc declared as ISVNConflictHandlerModifier and TypeFieldDescriptionprivate ISVNConflictHandler
DefaultSVNMerger.myConflictCallback
private ISVNConflictHandler
DefaultSVNOptions.myConflictResolver
Methods in org.tmatesoft.svn.core.internal.wc that return ISVNConflictHandlerMethods in org.tmatesoft.svn.core.internal.wc with parameters of type ISVNConflictHandlerModifier and TypeMethodDescriptionvoid
DefaultSVNOptions.setConflictHandler
(ISVNConflictHandler resolver) Constructors in org.tmatesoft.svn.core.internal.wc with parameters of type ISVNConflictHandlerModifierConstructorDescriptionDefaultSVNMerger
(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback) Deprecated.DefaultSVNMerger
(byte[] start, byte[] sep, byte[] end, ISVNConflictHandler callback, SVNDiffConflictChoiceStyle style) -
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.internal.wc17
Fields in org.tmatesoft.svn.core.internal.wc17 declared as ISVNConflictHandlerModifier and TypeFieldDescriptionSVNWCContext.ConflictStatusWalker.conflictHandler
private ISVNConflictHandler
SVNUpdateEditor17.myConflictHandler
Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type ISVNConflictHandlerModifier and TypeMethodDescriptionprivate SVNWCContext.MergePropStatusInfo
SVNWCContext.applySingleGenericPropChange
(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) private SVNWCContext.MergePropStatusInfo
SVNWCContext.applySingleMergeinfoPropChange
(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) (package private) SVNWCContext.MergePropStatusInfo
SVNWCContext.applySinglePropAdd
(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue toVal, ISVNConflictHandler conflictResolver, boolean dryRun) (package private) SVNWCContext.MergePropStatusInfo
SVNWCContext.applySinglePropChange
(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, SVNPropertyValue newVal, ISVNConflictHandler conflictResolver, boolean dryRun) (package private) SVNWCContext.MergePropStatusInfo
SVNWCContext.applySinglePropDelete
(SVNStatusType state, File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, SVNProperties workingProps, String propname, SVNPropertyValue baseVal, SVNPropertyValue oldVal, ISVNConflictHandler conflictResolver, boolean dryRun) 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) private boolean
SVNWCContext.generatePropConflict
(File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, String propName, SVNPropertyValue baseVal, SVNPropertyValue workingVal, SVNPropertyValue incomingOldVal, SVNPropertyValue incomingNewVal, ISVNConflictHandler conflictHandler) void
SVNWCContext.invokeConflictResolver
(File localAbsPath, SVNSkel conflictSkel, ISVNConflictHandler conflictHandler, ISVNCanceller canceller) private boolean
SVNWCContext.maybeGeneratePropConflict
(File localAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean isDir, String propname, SVNProperties workingProps, SVNPropertyValue oldVal, SVNPropertyValue newVal, SVNPropertyValue baseVal, SVNPropertyValue workingVal, ISVNConflictHandler conflictResolver, boolean dryRun) private SVNWCContext.MergeInfo
SVNWCContext.maybeResolveConflicts
(File leftAbspath, File rightAbspath, File targetAbspath, File copyfromText, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, SVNPropertyValue mimeprop, SVNDiffOptions options, ISVNConflictHandler conflictResolver) 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.mergeProperties
(File localAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties baseProperties, SVNProperties propChanges, boolean dryRun, ISVNConflictHandler conflictResolver) 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) private void
SVNWCContext.recursiveResolveConflict
(File localAbsPath, SVNDepth depth, boolean resolveText, String resolveProps, boolean resolveTree, SVNConflictChoice conflictChoice, ISVNConflictHandler conflictHandler) SVNWCContext.resolveTextConflict
(File localAbsPath, SVNOperation operation, File leftAbsPath, File rightAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, File resultTarget, File detranslatedTarget, ISVNConflictHandler conflictHandler) -
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.internal.wc2.ng
Classes in org.tmatesoft.svn.core.internal.wc2.ng that implement ISVNConflictHandlerModifier and TypeClassDescriptionprivate static class
Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type ISVNConflictHandlerModifier and TypeMethodDescriptionprivate SvnNgMergeCallback2.MergeOutcome
SvnNgMergeCallback2.merge
(File leftAbsPath, File rightAbsPath, File targetAbsPath, String leftLabel, String rightLabel, String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, String diff3Cmd, SVNDiffOptions mergeOptions, SVNProperties originalProps, SVNProperties propChanges, boolean mergeContentNeeded, boolean mergePropsNeeded, ISVNConflictHandler conflictResolver) 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) -
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.javahl
Fields in org.tmatesoft.svn.core.javahl declared as ISVNConflictHandlerMethods in org.tmatesoft.svn.core.javahl that return ISVNConflictHandlerModifier and TypeMethodDescriptionprotected ISVNConflictHandler
SVNClientImpl.getConflictHandler()
-
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.javahl17
Fields in org.tmatesoft.svn.core.javahl17 declared as ISVNConflictHandlerMethods in org.tmatesoft.svn.core.javahl17 that return ISVNConflictHandlerModifier and TypeMethodDescriptionprotected ISVNConflictHandler
SVNClientImpl.getConflictHandler()
private ISVNConflictHandler
SVNClientImpl.getConflictHandler
(ConflictResolverCallback callback) -
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.wc
Methods in org.tmatesoft.svn.core.wc that return ISVNConflictHandler -
Uses of ISVNConflictHandler in org.tmatesoft.svn.core.wc2
Methods in org.tmatesoft.svn.core.wc2 with parameters of type ISVNConflictHandlerModifier and TypeMethodDescriptionISvnMerger.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 changespropChanges
based onserverBaseProperties
into the working copylocalAbsPath
DefaultSVNMerger(byte[], byte[], byte[], ISVNConflictHandler, SVNDiffConflictChoiceStyle)
instead