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.cli.svn | |
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.
|
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 ConflictDescriptor |
JavaHLObjectFactory.createConflictDescription(SVNConflictDescription conflictDescription) |
Modifier and Type | Method and Description |
---|---|
SVNConflictResult |
SVNCommandLineConflictHandler.handleConflict(SVNConflictDescription conflictDescription) |
SVNConflictResult |
SVNCommandLineConflictHandler.handleConflictNoStats(SVNConflictDescription conflictDescription) |
Modifier and Type | Method and Description |
---|---|
private SVNConflictDescription |
SVNWCContext.setupTextConflictDesc(java.io.File leftAbspath,
java.io.File rightAbspath,
java.io.File targetAbspath,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
java.io.File resultTarget,
java.io.File detranslatedTarget,
SVNPropertyValue mimeprop,
boolean isBinary) |
private SVNConflictDescription |
SVNWCContext.setupTreeConflictDesc(java.io.File localAbsPath,
SVNOperation operation,
SVNConflictVersion leftVersion,
SVNConflictVersion rightVersion,
SVNConflictReason localChange,
SVNConflictAction incomingChange) |
SVNConflictDescription |
SVNWCConflictDescription17.toConflictDescription() |
Modifier and Type | Method and Description |
---|---|
java.util.List<SVNConflictDescription> |
SVNWCDb.readConflicts(java.io.File localAbsPath) |
java.util.List<SVNConflictDescription> |
ISVNWCDb.readConflicts(java.io.File localAbsPath)
Return all conflicts that have LOCAL_ABSPATH as victim.
|
Modifier and Type | Field and Description |
---|---|
private java.util.List<SVNConflictDescription> |
SvnNgAbstractUpdate.RecordConflictsResolver.conflicts |
Modifier and Type | Method and Description |
---|---|
private java.util.List<SVNConflictDescription> |
SvnNgAbstractUpdate.RecordConflictsResolver.getConflicts() |
Modifier and Type | Method and Description |
---|---|
SVNConflictResult |
SvnNgAbstractUpdate.RecordConflictsResolver.handleConflict(SVNConflictDescription conflictDescription) |
Modifier and Type | Method and Description |
---|---|
private ConflictDescriptor |
SVNClientImpl.getConflictDescription(SVNConflictDescription conflictDescription) |
private ConflictDescriptor.Kind |
SVNClientImpl.getConflictDescriptorKind(SVNConflictDescription conflictDescription) |
Modifier and Type | Method and Description |
---|---|
private java.util.Set<ConflictDescriptor> |
SVNClientImpl.getConflictDescriptors(java.util.Collection<SVNConflictDescription> conflicts) |
Modifier and Type | Class and Description |
---|---|
class |
SVNPropertyConflictDescription
SVNPropertyConflictDescription brings a property conflict description.
|
class |
SVNTextConflictDescription
SVNTextConflictDescription brings information about conflict on a file.
|
class |
SVNTreeConflictDescription
SVNTreeConflictDescription brings information on a tree conflict.
|
Modifier and Type | Method and Description |
---|---|
SVNConflictResult |
ISVNConflictHandler.handleConflict(SVNConflictDescription conflictDescription)
Handles the conflict given the conflict description
conflictDescription and returns
SVNConflictResult.getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and
SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties. |
Modifier and Type | Field and Description |
---|---|
private java.util.Collection<SVNConflictDescription> |
SvnWorkingCopyInfo.conflicts |
Modifier and Type | Method and Description |
---|---|
java.util.Collection<SVNConflictDescription> |
SvnWorkingCopyInfo.getConflicts()
Returns all item's conflicts.
|
Modifier and Type | Method and Description |
---|---|
void |
SvnWorkingCopyInfo.setConflicts(java.util.Collection<SVNConflictDescription> conflicts)
Sets the item's conflicts.
|