Uses of Class
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion

Packages that use SVNConflictVersion

Package	Description
org.tigris.subversion.javahl	Provides a (mostly native, using JNI and javah) implementation of a high level Java API for Subversion.
org.tmatesoft.svn.cli.svn
org.tmatesoft.svn.core.internal.wc
org.tmatesoft.svn.core.internal.wc17
org.tmatesoft.svn.core.internal.wc17.db
org.tmatesoft.svn.core.internal.wc2.ng
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.

Uses of SVNConflictVersion in org.tigris.subversion.javahl

Methods in org.tigris.subversion.javahl with parameters of type SVNConflictVersion

Modifier and Type	Method	Description
private static ConflictVersion	JavaHLObjectFactory.createConflictVersion(SVNConflictVersion version)

Uses of SVNConflictVersion in org.tmatesoft.svn.cli.svn

Methods in org.tmatesoft.svn.cli.svn with parameters of type SVNConflictVersion

Modifier and Type	Method	Description
private java.lang.StringBuffer	SVNInfoCommand.printConflictVersionXML(SVNConflictVersion version, java.lang.String name, java.lang.StringBuffer target)

Uses of SVNConflictVersion in org.tmatesoft.svn.core.internal.wc

Methods in org.tmatesoft.svn.core.internal.wc that return SVNConflictVersion

Modifier and Type	Method	Description
private static SVNConflictVersion	SVNTreeConflictUtil.readConflictVersion(SVNSkel skel)

Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNConflictVersion

Modifier and Type	Method	Description
static SVNSkel	SVNTreeConflictUtil.getConflictSkel(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict)
static java.lang.String	SVNTreeConflictUtil.getHumanReadableConflictVersion(SVNConflictVersion version)
private static SVNSkel	SVNTreeConflictUtil.prependVersionInfo(SVNSkel parent, SVNConflictVersion versionInfo)

Uses of SVNConflictVersion in org.tmatesoft.svn.core.internal.wc17

Fields in org.tmatesoft.svn.core.internal.wc17 declared as SVNConflictVersion

Modifier and Type	Field	Description
(package private) SVNConflictVersion	SVNTreeConflictEditor.WorkingNodeVersion.locationAndKind
private final SVNConflictVersion	SVNTreeConflictEditor.newVersion
private final SVNConflictVersion	SVNTreeConflictEditor.oldVersion
private SVNConflictVersion	SVNWCConflictDescription17.srcLeftVersion
private SVNConflictVersion	SVNWCConflictDescription17.srcRightVersion

Methods in org.tmatesoft.svn.core.internal.wc17 that return SVNConflictVersion

Modifier and Type	Method	Description
SVNConflictVersion	SVNWCConflictDescription17.getSrcLeftVersion()
SVNConflictVersion	SVNWCConflictDescription17.getSrcRightVersion()

Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNConflictVersion

Modifier and Type	Method	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 SVNWCConflictDescription17	SVNWCConflictDescription17.createTree(java.io.File localAbspath, SVNNodeKind nodeKind, SVNOperation operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion)
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)
private void	SVNTreeConflictEditor.markTreeConflict(java.io.File localRelPath, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, java.io.File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, java.io.File moveSrcOpRootRelPath)
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)
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.mergeProperties(java.io.File localAbsPath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNProperties baseProperties, SVNProperties propChanges, 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)
SVNWCContext.MergeInfo	SVNWCContext.mergeText(java.io.File left, java.io.File right, java.io.File target, java.lang.String leftLabel, java.lang.String rightLabel, java.lang.String targetLabel, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, boolean dryRun, SVNDiffOptions options, SVNProperties propDiff)
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)
void	SVNWCConflictDescription17.setSrcLeftVersion(SVNConflictVersion srcLeftVersion)
void	SVNWCConflictDescription17.setSrcRightVersion(SVNConflictVersion srcRightVersion)
private SVNConflictDescription	SVNWCContext.setupTextConflictDesc(java.io.File leftAbspath, java.io.File rightAbspath, java.io.File targetAbspath, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, java.io.File resultTarget, java.io.File detranslatedTarget, SVNPropertyValue mimeprop, boolean isBinary)
private SVNConflictDescription	SVNWCContext.setupTreeConflictDesc(java.io.File localAbsPath, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion, SVNConflictReason localChange, SVNConflictAction incomingChange)

Constructors in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNConflictVersion

Modifier	Constructor	Description
	SVNTreeConflictEditor(SVNWCDb db, SVNOperation operation, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot, java.io.File moveRootDstRelPath)

Uses of SVNConflictVersion in org.tmatesoft.svn.core.internal.wc17.db

Fields in org.tmatesoft.svn.core.internal.wc17.db declared as SVNConflictVersion

Modifier and Type	Field	Description
SVNConflictVersion	SVNWCDb.ResolveDeleteRaiseMovedAway.newVersion
SVNConflictVersion	SVNWCDb.UpdateMovedAwayConflictVictim.newVersion
SVNConflictVersion	SVNWCDb.ResolveDeleteRaiseMovedAway.oldVersion
SVNConflictVersion	SVNWCDb.UpdateMovedAwayConflictVictim.oldVersion

Methods in org.tmatesoft.svn.core.internal.wc17.db that return SVNConflictVersion

Modifier and Type	Method	Description
private static SVNConflictVersion	SvnWcDbConflicts.readConflictLocation(SVNSkel locationSkel)

Methods in org.tmatesoft.svn.core.internal.wc17.db with parameters of type SVNConflictVersion

Modifier and Type	Method	Description
static void	SvnWcDbConflicts.conflictSkelOpMerge(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target)
static void	SvnWcDbConflicts.conflictSkelOpSwitch(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target)
static void	SvnWcDbConflicts.conflictSkelOpUpdate(SVNSkel conflictSkel, SVNConflictVersion original, SVNConflictVersion target)
private void	SVNWCDb.driveTreeConflictEditor(SVNTreeConflictEditor treeConflictEditor, java.io.File srcRelPath, java.io.File dstRelPath, int srcOpDepth, SVNOperation operation, SVNConflictReason localChange, SVNConflictAction incomingChange, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, SVNWCDbRoot wcRoot)
private void	SVNWCDb.markTreeConflict(java.io.File localRelPath, SVNWCDbRoot wcRoot, SVNConflictVersion oldVersion, SVNConflictVersion newVersion, java.io.File moveRootDstRelPath, SVNOperation operation, SVNNodeKind oldKind, SVNNodeKind newKind, java.io.File oldReposRelPath, SVNConflictReason reason, SVNConflictAction action, java.io.File moveSrcOpRootRelPath)
static void	SvnWcDbConflicts.prependLocation(SVNSkel skel, SVNConflictVersion location)
static void	SvnWcDbConflicts.readPropertyConflicts(java.util.List<SVNWCConflictDescription17> target, SVNWCDb db, java.io.File localAbsPath, SVNSkel conflictSkel, boolean createTempFiles, SVNOperation operation, SVNConflictVersion leftVersion, SVNConflictVersion rightVersion)
static void	SvnWcDbConflicts.setConflictOperation(SVNSkel skel, SVNOperation operation, SVNConflictVersion original, SVNConflictVersion target)

Uses of SVNConflictVersion in org.tmatesoft.svn.core.internal.wc2.ng

Methods in org.tmatesoft.svn.core.internal.wc2.ng that return SVNConflictVersion

Modifier and Type	Method	Description
private SVNConflictVersion[]	SvnNgMergeCallback.makeConflictVersions(java.io.File target, SVNNodeKind kind)
private SVNConflictVersion[]	SvnNgMergeCallback2.makeConflictVersions(java.io.File victimAbsPath, SVNNodeKind nodeKind, SVNURL rootUrl, SvnNgMergeDriver.MergeSource mergeSource, java.io.File targetAbsPath)

Methods in org.tmatesoft.svn.core.internal.wc2.ng with parameters of type SVNConflictVersion

Modifier and Type	Method	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)

Uses of SVNConflictVersion in org.tmatesoft.svn.core.javahl17

Methods in org.tmatesoft.svn.core.javahl17 with parameters of type SVNConflictVersion

Modifier and Type	Method	Description
private ConflictVersion	SVNClientImpl.getConflictVersion(SVNConflictVersion conflictVersion)

Uses of SVNConflictVersion in org.tmatesoft.svn.core.wc

Fields in org.tmatesoft.svn.core.wc declared as SVNConflictVersion

Modifier and Type	Field	Description
private SVNConflictVersion	SVNTreeConflictDescription.mySourceLeftVersion
private SVNConflictVersion	SVNTreeConflictDescription.mySourceRightVersion

Methods in org.tmatesoft.svn.core.wc that return SVNConflictVersion

Modifier and Type	Method	Description
SVNConflictVersion	SVNTreeConflictDescription.getSourceLeftVersion()	Returns info on the "merge-left source" or "older" version of incoming change.
SVNConflictVersion	SVNTreeConflictDescription.getSourceRightVersion()	Returns info on the "merge-right source" or "their" version of incoming change.

Methods in org.tmatesoft.svn.core.wc with parameters of type SVNConflictVersion

Modifier and Type	Method	Description
void	SVNTreeConflictDescription.setSourceLeftVersion(SVNConflictVersion sourceLeftVersion)

Constructors in org.tmatesoft.svn.core.wc with parameters of type SVNConflictVersion

Modifier	Constructor	Description
	SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion)	Creates a new SVNTreeConflictDescription.

Uses of SVNConflictVersion in org.tmatesoft.svn.core.wc2

Methods in org.tmatesoft.svn.core.wc2 with parameters of type SVNConflictVersion

Modifier and Type	Method	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