Package | Description |
---|---|
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.
|
Modifier and Type | Method and Description |
---|---|
SVNOperation |
SVNWCConflictDescription17.getOperation() |
Modifier and Type | Method and Description |
---|---|
static SVNWCConflictDescription17 |
SVNWCConflictDescription17.createTree(File localAbspath,
SVNNodeKind nodeKind,
SVNOperation operation,
SVNConflictVersion srcLeftVersion,
SVNConflictVersion srcRightVersion) |
org.tmatesoft.svn.core.internal.wc17.SVNWCContext.TextConflictResolutionInfo |
SVNWCContext.resolveTextConflict(File localAbsPath,
SVNOperation operation,
File leftAbsPath,
File rightAbsPath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
File resultTarget,
File detranslatedTarget,
ISVNConflictHandler conflictHandler) |
void |
SVNWCConflictDescription17.setOperation(SVNOperation operation) |
Constructor and Description |
---|
SVNTreeConflictEditor(SVNWCDb db,
SVNOperation operation,
SVNConflictVersion oldVersion,
SVNConflictVersion newVersion,
SVNWCDbRoot wcRoot,
File moveRootDstRelPath) |
Modifier and Type | Method and Description |
---|---|
static void |
SvnWcDbConflicts.readPropertyConflicts(List<SVNWCConflictDescription17> target,
SVNWCDb db,
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 | Field and Description |
---|---|
static SVNOperation |
SVNOperation.MERGE
Merge operation.
|
static SVNOperation |
SVNOperation.NONE
None.
|
static SVNOperation |
SVNOperation.SWITCH
Switch operation.
|
static SVNOperation |
SVNOperation.UPDATE
Update operation.
|
Modifier and Type | Method and Description |
---|---|
static SVNOperation |
SVNOperation.fromString(String operation)
Converts a string operation name to an
SVNOperation object. |
SVNOperation |
SVNTreeConflictDescription.getOperation()
Returns the user operation that exposed this tree conflict.
|
Constructor and Description |
---|
SVNTreeConflictDescription(File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
SVNConflictVersion sourceLeftVersion,
SVNConflictVersion sourceRightVersion)
Creates a new
SVNTreeConflictDescription . |
Copyright © 2018. All rights reserved.