|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Uses of ExternalToolset in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
---|
Constructors in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ExternalToolset | |
---|---|
ExternalConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText,
ConflictResolutionOptions options,
ExternalToolset configuredMergeTools)
|
Uses of ExternalToolset in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors |
---|
Constructors in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors with parameters of type ExternalToolset | |
---|---|
ExternalConflictResolutionContributor(ExternalToolset mergeToolset)
|
Uses of ExternalToolset in com.microsoft.tfs.core.clients.versioncontrol.engines |
---|
Constructors in com.microsoft.tfs.core.clients.versioncontrol.engines with parameters of type ExternalToolset | |
---|---|
MergeEngine(Workspace workspace,
VersionControlClient client,
ExternalToolset mergeToolset)
Creates a MergeEngine with the given workspace, client, and merge
toolset (which will be used to select a tool when external merges require
them). |
Uses of ExternalToolset in com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type ExternalToolset | |
---|---|
void |
Workspace.resolveConflict(Conflict conflict,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts,
java.lang.String[] itemPropertyFilters,
ExternalToolset externalToolset,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
|
void |
Workspace.resolveConflicts(Conflict[] conflicts,
java.lang.String[] itemPropertyFilters,
ResolveErrorOptions errorOptions,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts,
ExternalToolset externalToolset,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
Attempts to resolve conflicts according to their Resolution property. |
Uses of ExternalToolset in com.microsoft.tfs.core.externaltools |
---|
Methods in com.microsoft.tfs.core.externaltools that return ExternalToolset | |
---|---|
static ExternalToolset |
ExternalToolset.loadFromMemento(Memento memento)
Loads toolset state from the given Memento , which can have any
name. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |