| Package | Description |
|---|---|
| org.apache.subversion.javahl | |
| org.tmatesoft.svn.core.javahl17 |
| Modifier and Type | Field and Description |
|---|---|
private ConflictResult.Choice |
ConflictResult.choice
A value corresponding to the
svn_wc_conflict_choice_t enum. |
| Modifier and Type | Method and Description |
|---|---|
ConflictResult.Choice |
ConflictResult.getChoice() |
static ConflictResult.Choice |
ConflictResult.Choice.valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.
|
static ConflictResult.Choice[] |
ConflictResult.Choice.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
| Modifier and Type | Method and Description |
|---|---|
void |
SVNClient.resolve(java.lang.String path,
Depth depth,
ConflictResult.Choice conflictResult) |
void |
ISVNClient.resolve(java.lang.String path,
Depth depth,
ConflictResult.Choice conflictResult)
Resolves the conflicted state on a WC path (or tree).
|
| Constructor and Description |
|---|
ConflictResult(ConflictResult.Choice choice,
java.lang.String mergedPath)
Create a new conflict result instace.
|
| Modifier and Type | Method and Description |
|---|---|
private SVNConflictChoice |
SVNClientImpl.getSVNConflictChoice(ConflictResult.Choice choice) |
void |
SVNClientImpl.resolve(java.lang.String path,
Depth depth,
ConflictResult.Choice conflictResult) |