Uses of Class
org.tmatesoft.svn.core.internal.wc.SVNConflictVersion
-
Packages that use SVNConflictVersion Package Description org.tmatesoft.svn.core.internal.wc org.tmatesoft.svn.core.internal.wc17 org.tmatesoft.svn.core.internal.wc17.db 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.tmatesoft.svn.core.internal.wc
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)
-
Uses of SVNConflictVersion in org.tmatesoft.svn.core.internal.wc17
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 static SVNWCConflictDescription17
SVNWCConflictDescription17. createTree(java.io.File localAbspath, SVNNodeKind nodeKind, SVNOperation operation, SVNConflictVersion srcLeftVersion, SVNConflictVersion srcRightVersion)
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)
org.tmatesoft.svn.core.internal.wc17.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)
Constructors in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNConflictVersion 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
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)
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.wc
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 Constructor Description SVNTreeConflictDescription(java.io.File path, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason, SVNOperation operation, SVNConflictVersion sourceLeftVersion, SVNConflictVersion sourceRightVersion)
Creates a newSVNTreeConflictDescription
. -
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 changespropChanges
based onserverBaseProperties
into the working copylocalAbsPath
-