Package | Description |
---|---|
org.tmatesoft.svn.core.internal.wc | |
org.tmatesoft.svn.core.internal.wc.admin | |
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 |
---|---|
protected SVNTreeConflictDescription |
SVNMergeDriver.makeTreeConflict(File victim,
SVNNodeKind kind,
SVNConflictAction action,
SVNConflictReason reason) |
static SVNTreeConflictDescription |
SVNTreeConflictUtil.readSingleTreeConflict(SVNSkel skel,
File dirPath) |
Modifier and Type | Method and Description |
---|---|
static SVNSkel |
SVNTreeConflictUtil.getConflictSkel(SVNConflictVersion nullVersion,
SVNTreeConflictDescription conflict) |
static String |
SVNTreeConflictUtil.getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict) |
static String |
SVNTreeConflictUtil.getSingleTreeConflictData(SVNTreeConflictDescription conflict) |
static byte[] |
SVNTreeConflictUtil.getSingleTreeConflictRawData(SVNTreeConflictDescription conflict) |
Modifier and Type | Method and Description |
---|---|
SVNTreeConflictDescription |
SVNAdminArea14.deleteTreeConflict(String name) |
SVNTreeConflictDescription |
SVNXMLAdminArea.deleteTreeConflict(String name) |
SVNTreeConflictDescription |
SVNAdminArea16.deleteTreeConflict(String victimName) |
abstract SVNTreeConflictDescription |
SVNAdminArea.deleteTreeConflict(String name) |
SVNTreeConflictDescription |
SVNWCAccess.getTreeConflict(File path) |
SVNTreeConflictDescription |
SVNAdminArea14.getTreeConflict(String name) |
SVNTreeConflictDescription |
SVNXMLAdminArea.getTreeConflict(String name) |
SVNTreeConflictDescription |
SVNAdminArea16.getTreeConflict(String victimName) |
abstract SVNTreeConflictDescription |
SVNAdminArea.getTreeConflict(String name) |
Modifier and Type | Method and Description |
---|---|
abstract Map<File,SVNTreeConflictDescription> |
SVNEntry.getTreeConflicts() |
Modifier and Type | Method and Description |
---|---|
void |
SVNAdminArea14.addTreeConflict(SVNTreeConflictDescription conflict) |
void |
SVNXMLAdminArea.addTreeConflict(SVNTreeConflictDescription conflict) |
void |
SVNAdminArea16.addTreeConflict(SVNTreeConflictDescription conflict) |
abstract void |
SVNAdminArea.addTreeConflict(SVNTreeConflictDescription conflict) |
Modifier and Type | Field and Description |
---|---|
SVNTreeConflictDescription |
SVNWCContext.ConflictInfo.treeConflict |
Modifier and Type | Method and Description |
---|---|
SVNTreeConflictDescription |
SVNWCContext.getTreeConflict(File victimAbspath) |
Modifier and Type | Method and Description |
---|---|
SVNTreeConflictDescription |
ISVNWCDb.opReadTreeConflict(File localAbspath)
Get any tree conflict associated with localAbspath in DB.
|
SVNTreeConflictDescription |
SVNWCDb.opReadTreeConflict(File localAbsPath) |
Modifier and Type | Method and Description |
---|---|
Map<String,SVNTreeConflictDescription> |
ISVNWCDb.opReadAllTreeConflicts(File localAbsPath)
Return all the children of localAbsPath that are in tree conflicts.
|
Map<String,SVNTreeConflictDescription> |
SVNWCDb.opReadAllTreeConflicts(File localAbsPath) |
Modifier and Type | Method and Description |
---|---|
void |
ISVNWCDb.opSetTreeConflict(File localAbspath,
SVNTreeConflictDescription treeConflict)
Set the tree conflict on LOCAL_ABSPATH in DB to TREE_CONFLICT.
|
void |
SVNWCDb.opSetTreeConflict(File localAbspath,
SVNTreeConflictDescription treeConflict) |
static SVNSkel |
SvnWcDbConflicts.treeConflictDescriptionToSkel(ISVNWCDb db,
File wriAbsPath,
SVNTreeConflictDescription conflictDescription) |
Modifier and Type | Method and Description |
---|---|
SVNTreeConflictDescription |
SVNStatus.getTreeConflict()
Returns a tree conflict description.
|
SVNTreeConflictDescription |
SVNInfo.getTreeConflict()
Returns a tree conflict description on the item represented by
this object.
|
Modifier and Type | Method and Description |
---|---|
static SVNInfo |
SVNInfo.createInfo(File file,
SVNTreeConflictDescription tc) |
void |
SVNStatus.setTreeConflict(SVNTreeConflictDescription treeConflict) |
Constructor and Description |
---|
SVNInfo(File file,
SVNURL url,
SVNURL rootURL,
long revision,
SVNNodeKind kind,
String uuid,
long committedRevision,
String committedDate,
String author,
String schedule,
SVNURL copyFromURL,
long copyFromRevision,
String textTime,
String propTime,
String checksum,
String conflictOld,
String conflictNew,
String conflictWorking,
String propRejectFile,
SVNLock lock,
SVNDepth depth,
String changelistName,
long wcSize,
SVNTreeConflictDescription treeConflict) |
SVNStatus(SVNURL url,
File file,
SVNNodeKind kind,
SVNRevision revision,
SVNRevision committedRevision,
Date committedDate,
String author,
SVNStatusType contentsStatus,
SVNStatusType propertiesStatus,
SVNStatusType remoteContentsStatus,
SVNStatusType remotePropertiesStatus,
boolean isLocked,
boolean isCopied,
boolean isSwitched,
boolean isFileExternal,
File conflictNewFile,
File conflictOldFile,
File conflictWrkFile,
File projRejectFile,
String copyFromURL,
SVNRevision copyFromRevision,
SVNLock remoteLock,
SVNLock localLock,
Map entryProperties,
String changelistName,
int wcFormatVersion,
SVNTreeConflictDescription treeConflict)
Constructs an SVNStatus object filling it with status information
details.
|
Copyright © 2022. All rights reserved.