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.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc17 | |
org.tmatesoft.svn.core.internal.wc17.db | |
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.
|
Modifier and Type | Method and Description |
---|---|
private static int |
JavaHLObjectFactory.getConflictOperation(SVNOperation operation) |
Modifier and Type | Method and Description |
---|---|
private static SVNOperation |
SVNTreeConflictUtil.getOperation(java.lang.String name) |
Modifier and Type | Field and Description |
---|---|
private SVNOperation |
SVNTreeConflictEditor.operation |
private SVNOperation |
SVNWCConflictDescription17.operation |
Modifier and Type | Method and Description |
---|---|
SVNOperation |
SVNWCConflictDescription17.getOperation() |
Modifier and Type | Method and Description |
---|---|
private SVNSkel |
SVNTreeConflictEditor.createConflictMarkers(java.io.File localAbsPath,
java.io.File reposRelPath,
SVNSkel conflictSkel,
SVNOperation operation,
SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion,
SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion,
SVNNodeKind kind) |
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) |
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.setOperation(SVNOperation operation) |
private SVNConflictDescription |
SVNWCContext.setupTreeConflictDesc(java.io.File localAbsPath,
SVNOperation operation,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNConflictReason localChange,
SVNConflictAction incomingChange) |
private void |
SVNTreeConflictEditor.updateWorkingFile(java.io.File localRelPath,
java.io.File reposRelPath,
SVNOperation operation,
SVNTreeConflictEditor.WorkingNodeVersion oldNodeVersion,
SVNTreeConflictEditor.WorkingNodeVersion newNodeVersion) |
Constructor and Description |
---|
SVNTreeConflictEditor(SVNWCDb db,
SVNOperation operation,
SVNConflictVersion oldVersion,
SVNConflictVersion newVersion,
SVNWCDbRoot wcRoot,
java.io.File moveRootDstRelPath) |
Modifier and Type | Field and Description |
---|---|
SVNOperation |
SVNWCDb.ResolveDeleteRaiseMovedAway.operation |
SVNOperation |
SVNWCDb.UpdateMovedAwayConflictVictim.operation |
Modifier and Type | Method and Description |
---|---|
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.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 |
---|---|
private ConflictDescriptor.Operation |
SVNClientImpl.getConflictDescriptorOperation(SVNOperation operation) |
Modifier and Type | Field and Description |
---|---|
static SVNOperation |
SVNOperation.MERGE
Merge operation.
|
private SVNOperation |
SVNTreeConflictDescription.myOperation |
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(java.lang.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(java.io.File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
SVNConflictVersion sourceLeftVersion,
SVNConflictVersion sourceRightVersion)
Creates a new
SVNTreeConflictDescription . |