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.
|
Modifier and Type | Method and Description |
---|---|
static SVNSkel |
SVNTreeConflictUtil.getConflictSkel(SVNConflictVersion nullVersion,
SVNTreeConflictDescription conflict) |
static java.lang.String |
SVNTreeConflictUtil.getHumanReadableConflictVersion(SVNConflictVersion version) |
Modifier and Type | Method and Description |
---|---|
SVNConflictVersion |
SVNWCConflictDescription17.getSrcLeftVersion() |
SVNConflictVersion |
SVNWCConflictDescription17.getSrcRightVersion() |
Modifier and Type | Method and Description |
---|---|
static SVNWCConflictDescription17 |
SVNWCConflictDescription17.createTree(java.io.File localAbspath,
SVNNodeKind nodeKind,
SVNOperation operation,
SVNConflictVersion srcLeftVersion,
SVNConflictVersion srcRightVersion) |
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) |
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) |
Constructor and Description |
---|
SVNTreeConflictEditor(SVNWCDb db,
SVNOperation operation,
SVNConflictVersion oldVersion,
SVNConflictVersion newVersion,
SVNWCDbRoot wcRoot,
java.io.File moveRootDstRelPath) |
Modifier and Type | Method and 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) |
Modifier and Type | Method and 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.
|
Modifier and Type | Method and Description |
---|---|
void |
SVNTreeConflictDescription.setSourceLeftVersion(SVNConflictVersion sourceLeftVersion) |
Constructor and Description |
---|
SVNTreeConflictDescription(java.io.File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
SVNConflictVersion sourceLeftVersion,
SVNConflictVersion sourceRightVersion)
Creates a new
SVNTreeConflictDescription . |
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 |
Copyright © 2020. All rights reserved.