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.admin | |
org.tmatesoft.svn.core.internal.wc16 | |
org.tmatesoft.svn.core.internal.wc17 | |
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 SVNConflictChoice |
JavaHLObjectFactory.getSVNConflictChoice(int conflictResult) |
Modifier and Type | Method and Description |
---|---|
boolean |
SVNAdminArea.markResolved(String name,
boolean text,
boolean props,
SVNConflictChoice conflictChoice) |
Modifier and Type | Method and Description |
---|---|
void |
SVNWCClient16.doResolve(File path,
SVNDepth depth,
boolean resolveContents,
boolean resolveProperties,
boolean resolveTree,
SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copy
path . |
void |
SVNWCClient16.doResolve(File path,
SVNDepth depth,
boolean resolveContents,
boolean resolveProperties,
SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copy
path . |
void |
SVNWCClient16.doResolve(File path,
SVNDepth depth,
SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copy
path . |
Modifier and Type | Method and Description |
---|---|
boolean |
SVNWCContext.resolveConflictOnNode(File localAbsPath,
boolean resolveText,
boolean resolveProps,
SVNConflictChoice conflictChoice) |
void |
SVNWCContext.resolvedConflict(File localAbsPath,
SVNDepth depth,
boolean resolveText,
String resolveProps,
boolean resolveTree,
SVNConflictChoice conflictChoice) |
Modifier and Type | Field and Description |
---|---|
static SVNConflictChoice |
SVNConflictChoice.BASE
Constant saying to choose the base version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
SVNConflictChoice.MERGED
Constant saying to choose the merged version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
SVNConflictChoice.MINE_CONFLICT
Constant saying to choose the own (for conflicted hunks) version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
SVNConflictChoice.MINE_FULL
Constant saying to choose the own version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
SVNConflictChoice.POSTPONE
Constant saying: don't resolve the conflict now.
|
static SVNConflictChoice |
SVNConflictChoice.THEIRS_CONFLICT
Constant saying to choose the incoming (for conflicted hunks) version of the file to resolve the conflict here and now.
|
static SVNConflictChoice |
SVNConflictChoice.THEIRS_FULL
Constant saying to choose the incoming version of the file to resolve the conflict here and now.
|
Modifier and Type | Method and Description |
---|---|
SVNConflictChoice |
SVNConflictResult.getConflictChoice()
Returns the conflict handler's choice.
|
Modifier and Type | Method and Description |
---|---|
void |
SVNWCClient.doResolve(File path,
SVNDepth depth,
boolean resolveContents,
boolean resolveProperties,
boolean resolveTree,
SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copy
path . |
void |
SVNWCClient.doResolve(File path,
SVNDepth depth,
boolean resolveContents,
boolean resolveProperties,
SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copy
path . |
void |
SVNWCClient.doResolve(File path,
SVNDepth depth,
SVNConflictChoice conflictChoice)
Performs automatic conflict resolution on a working copy
path . |
Constructor and Description |
---|
SVNConflictResult(SVNConflictChoice conflictChoice,
File mergedFile)
Creates a new
SVNConflictChoice object. |
SVNConflictResult(SVNConflictChoice conflictChoice,
File mergedFile,
boolean saveMerged)
Creates a new
SVNConflictChoice object. |
Modifier and Type | Method and Description |
---|---|
SVNConflictChoice |
SvnResolve.getConflictChoice()
Gets kind of choice object for making decision while resolving.
|
Modifier and Type | Method and Description |
---|---|
void |
SvnResolve.setConflictChoice(SVNConflictChoice conflictChoice)
Sets kind of choice object for making decision while resolving.
|
Copyright © 2018. All rights reserved.