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.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.
|
Modifier and Type | Method and Description |
---|---|
static int |
JavaHLObjectFactory.getConflictReason(SVNConflictReason conflictReason) |
Modifier and Type | Method and Description |
---|---|
private static SVNConflictReason |
SVNTreeConflictUtil.getConflictReason(java.lang.String name) |
Modifier and Type | Method and Description |
---|---|
protected SVNTreeConflictDescription |
SVNMergeDriver.makeTreeConflict(java.io.File victim,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
protected void |
SVNMergeDriver.recordTreeConflict(java.io.File victim,
SVNAdminArea adminArea,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
protected void |
SVNMergeDriver.recordTreeConflictOnAdd(java.io.File victim,
SVNAdminArea adminArea,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
Modifier and Type | Field and Description |
---|---|
private SVNConflictReason |
SVNWCConflictDescription17.reason |
Modifier and Type | Method and Description |
---|---|
SVNConflictReason |
SVNWCConflictDescription17.getReason() |
Modifier and Type | Method and Description |
---|---|
private SVNTreeConflictDescription |
SVNUpdateEditor17.createTreeConflict(java.io.File localAbspath,
SVNConflictReason reason,
SVNConflictAction action,
SVNNodeKind theirNodeKind,
java.io.File theirRelpath) |
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) |
void |
SVNWCConflictDescription17.setReason(SVNConflictReason reason) |
private SVNConflictDescription |
SVNWCContext.setupTreeConflictDesc(java.io.File localAbsPath,
SVNOperation operation,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNConflictReason localChange,
SVNConflictAction incomingChange) |
Modifier and Type | Field and Description |
---|---|
SVNConflictReason |
SVNWCDb.UpdateMovedAwayConflictVictim.localChange |
Modifier and Type | Method and Description |
---|---|
static void |
SvnWcDbConflicts.addTreeConflict(SVNSkel skel,
ISVNWCDb db,
java.io.File wriAbsPath,
SVNConflictReason localChange,
SVNConflictAction incomingChange,
java.io.File moveSrcOpRootAbsPath) |
private static void |
SvnWcDbConflicts.addTreeConflict(SVNSkel skel,
SVNConflictReason localChange,
SVNConflictAction incomingChange) |
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) |
Modifier and Type | Field and Description |
---|---|
private SVNConflictReason |
SvnNgMergeCallback2.DirectoryBaton.treeConflictReason |
private SVNConflictReason |
SvnNgMergeCallback2.FileBaton.treeConflictReason |
Modifier and Type | Method and Description |
---|---|
private SVNTreeConflictDescription |
SvnNgMergeCallback.makeTreeConflict(java.io.File path,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
private void |
SvnNgMergeCallback2.recordTreeConflict(java.io.File localAbsPath,
SvnNgMergeCallback2.DirectoryBaton parentBaton,
SVNNodeKind nodeKind,
SVNConflictAction action,
SVNConflictReason reason,
SVNWCConflictDescription17 existingConflict,
boolean notifyTreeConflict) |
private void |
SvnNgMergeCallback.treeConflict(java.io.File path,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
private void |
SvnNgMergeCallback.treeConflictOnAdd(java.io.File path,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
Modifier and Type | Method and Description |
---|---|
private ConflictDescriptor.Reason |
SVNClientImpl.getConflictDescriptorReason(SVNConflictReason conflictReason) |
Modifier and Type | Field and Description |
---|---|
static SVNConflictReason |
SVNConflictReason.ADDED
Constant saying that an object is already added or schedule-add
|
static SVNConflictReason |
SVNConflictReason.DELETED
Constant saying that an object is already schedule-delete.
|
static SVNConflictReason |
SVNConflictReason.EDITED
Constant saying that local edits are already present.
|
static SVNConflictReason |
SVNConflictReason.MISSING
Constant saying that an object is unknown or missing.
|
static SVNConflictReason |
SVNConflictReason.MOVED_AWAY
Constant saying that an object has been moved away
|
static SVNConflictReason |
SVNConflictReason.MOVED_HERE
Constant saying that an object has been moved here
|
private SVNConflictReason |
SVNMergeResult.myConflictReason |
private SVNConflictReason |
SVNConflictDescription.myConflictReason |
static SVNConflictReason |
SVNConflictReason.OBSTRUCTED
Constant saying that another object is in the way.
|
static SVNConflictReason |
SVNConflictReason.REPLACED
Constant saying that an object is already replaced.
|
static SVNConflictReason |
SVNConflictReason.SKIP |
static SVNConflictReason |
SVNConflictReason.UNVERSIONED
Constant saying that an object is unversioned.
|
static SVNConflictReason |
SVNConflictReason.WC_SKIP |
Modifier and Type | Method and Description |
---|---|
static SVNConflictReason |
SVNConflictReason.fromString(java.lang.String reason)
Converts a string reason name to an
SVNConflictReason object. |
SVNConflictReason |
SVNMergeResult.getConflictReason()
Returns conflict reason.
|
SVNConflictReason |
SVNConflictDescription.getConflictReason()
Returns the reason why the conflict occurred.
|
Modifier and Type | Method and Description |
---|---|
static SVNMergeResult |
SVNMergeResult.createMergeResult(SVNStatusType status,
SVNConflictReason reason)
Creates a new merge result object.
|
Constructor and Description |
---|
SVNConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNConflictDescription object. |
SVNMergeResult(SVNStatusType status,
SVNConflictReason conflictReason) |
SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
java.lang.String propertyName,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNPropertyConflictDescription object. |
SVNTextConflictDescription(SVNMergeFileSet mergeFiles,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason)
Creates a new
SVNTextConflictDescription object. |
SVNTreeConflictDescription(java.io.File path,
SVNNodeKind nodeKind,
SVNConflictAction conflictAction,
SVNConflictReason conflictReason,
SVNOperation operation,
SVNConflictVersion sourceLeftVersion,
SVNConflictVersion sourceRightVersion)
Creates a new
SVNTreeConflictDescription . |