|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Uses of Conflict in com.microsoft.tfs.core.clients.versioncontrol |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol that return Conflict | |
---|---|
Conflict[] |
VersionControlClient.autoResolveValidConflicts(Workspace workspace,
Conflict[] conflicts,
AutoResolveOptions resolveOptions)
Takes a list of candidates for AutoResolve and attempts to resolve them with the correct resolution and performing a content merge if necessary. |
Conflict[] |
UnshelveResult.getConflicts()
|
Methods in com.microsoft.tfs.core.clients.versioncontrol that return types with arguments of type Conflict | |
---|---|
java.util.List<Conflict> |
ResolveConflictHandler.getResolvedConflicts()
|
Methods in com.microsoft.tfs.core.clients.versioncontrol with parameters of type Conflict | |
---|---|
Conflict[] |
VersionControlClient.autoResolveValidConflicts(Workspace workspace,
Conflict[] conflicts,
AutoResolveOptions resolveOptions)
Takes a list of candidates for AutoResolve and attempts to resolve them with the correct resolution and performing a content merge if necessary. |
void |
ResolveLocalConflictHandler.conflictResolved(Conflict conflict,
GetOperation[] getOps,
GetOperation[] undoOps,
Conflict[] resolvedConflicts,
ChangePendedFlags changePendedFlags)
|
void |
ResolveLocalConflictHandler.conflictResolved(Conflict conflict,
GetOperation[] getOps,
GetOperation[] undoOps,
Conflict[] resolvedConflicts,
ChangePendedFlags changePendedFlags)
|
void |
ResolveConflictHandler.conflictResolved(Conflict conflict,
GetOperation[] getOps,
GetOperation[] undoOps,
Conflict[] otherResolvedConflicts,
ChangePendedFlags changePendedFlags)
|
void |
ResolveConflictHandler.conflictResolved(Conflict conflict,
GetOperation[] getOps,
GetOperation[] undoOps,
Conflict[] otherResolvedConflicts,
ChangePendedFlags changePendedFlags)
|
void |
ResolveLocalConflictHandler.conflictResolveError(Conflict conflict,
java.lang.Exception exception)
|
void |
ResolveConflictHandler.conflictResolveError(Conflict conflict,
java.lang.Exception exception)
|
void |
VersionControlClient.resolveConflicts(Workspace workspace,
Conflict[] conflicts,
java.lang.String[] itemPropertyFilters,
ResolveErrorOptions errorOptions,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts)
|
void |
VersionControlClient.resolveLocalConflicts(Workspace workspace,
Conflict[] conflicts,
ResolveErrorOptions errorOptions)
Resolve local file conflicts. |
Constructors in com.microsoft.tfs.core.clients.versioncontrol with parameters of type Conflict | |
---|---|
UnshelveResult(Shelveset shelveset,
GetStatus status,
PendingChange[] changes,
Conflict[] conflicts)
Creates an UnshelveResult for the given result items. |
Uses of Conflict in com.microsoft.tfs.core.clients.versioncontrol.conflicts |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts that return Conflict | |
---|---|
Conflict |
ConflictDescription.getConflict()
Get the underlying core conflict for this conflict. |
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts with parameters of type Conflict | |
---|---|
static ConflictCategory |
ConflictCategory.getConflictCategory(Conflict conflict)
Given an AConflict, determines the type of conflict and returns the appropriate ConflictCategory which describes this conflict. |
static ConflictDescription |
ConflictDescriptionFactory.getConflictDescription(ConflictCategory category,
Conflict conflict)
Get a ConflictDescription which describes the type of conflict. |
static ConflictDescription |
ConflictDescriptionFactory.getConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
Get a ConflictDescription for this particular Conflict. |
static ConflictDescription[] |
ConflictDescriptionFactory.getConflictDescriptions(Workspace workspace,
Conflict[] conflicts,
ItemSpec[] conflictItemSpecs)
Convenience method to get multiple conflict descriptions for multiple conflicts. |
Uses of Conflict in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions that return Conflict | |
---|---|
Conflict[] |
ConflictResolution.getConflicts()
Queries the conflict resolver for any new conflicts which arised during the resolution of this conflict. |
Conflict[] |
AutomergeWritableConflictResolution.getConflicts()
|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type Conflict | |
---|---|
boolean |
ExternalConflictResolution.ExternalConflictResolver.resolveConflict(Workspace workspace,
Conflict conflict)
|
Uses of Conflict in com.microsoft.tfs.core.clients.versioncontrol.engines |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.engines with parameters of type Conflict | |
---|---|
java.lang.String |
MergeEngine.beginCustomMerge(Conflict conflict,
ThreeWayMerge threeWayMerge)
Sets up a merge for the given conflict so that callers may perform a custom merge process, returning the merge output file that should be written to to complete the merge. |
com.microsoft.tfs.util.process.ProcessRunner |
MergeEngine.beginExternalMerge(Conflict conflict,
ThreeWayMerge threeWayMerge,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
Begins an external content merge for the given conflict. |
void |
MergeEngine.countContentConflicts(Conflict conflict)
Counts the potential content merge conflicts for the given conflict and stores them in the conflict's merge summary. |
void |
MergeEngine.endCustomMerge(java.lang.String mergeFilename,
Conflict conflict,
ThreeWayMerge threeWayMerge,
boolean success)
Ends an custom content merge for the given conflict that was begun with MergeEngine.beginCustomMerge(Conflict, ThreeWayMerge) . |
boolean |
MergeEngine.endExternalMerge(com.microsoft.tfs.util.process.ProcessRunner runner,
Conflict conflict,
ThreeWayMerge threeWayMerge)
Ends an external content merge for the given conflict that was begun with MergeEngine.beginExternalMerge(Conflict, ThreeWayMerge, ProcessFinishedHandler, OutputStream, OutputStream)
. |
boolean |
MergeEngine.mergeContent(Conflict conflict,
boolean onlyCountConflicts,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
Merges content for the given conflict. |
Uses of Conflict in com.microsoft.tfs.core.clients.versioncontrol.events |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.events that return Conflict | |
---|---|
Conflict[] |
ResolveConflictsCompletedEvent.getConflict()
|
Conflict |
ResolveConflictStartedEvent.getConflict()
|
Conflict |
ResolveConflictCompletedEvent.getConflict()
|
Conflict |
ConflictResolvedEvent.getConflict()
|
Conflict[] |
ResolveConflictsStartedEvent.getConflicts()
|
Constructors in com.microsoft.tfs.core.clients.versioncontrol.events with parameters of type Conflict | |
---|---|
ConflictResolvedEvent(EventSource source,
Workspace workspace,
Conflict conflict,
ChangePendedFlags changePendedFlags)
|
|
MergingEvent(EventSource source,
Conflict conflict,
Workspace workspace,
boolean isLatest,
PendingChange pendingChange,
OperationStatus status,
ChangeType targetLocalChangeType,
boolean diskUpdateAttempted,
PropertyValue[] properties)
|
|
ResolveConflictCompletedEvent(EventSource source,
Workspace workspace,
Conflict conflict)
|
|
ResolveConflictsCompletedEvent(EventSource source,
Workspace workspace,
Conflict[] conflicts)
|
|
ResolveConflictsStartedEvent(EventSource source,
Workspace workspace,
Conflict[] conflicts)
|
|
ResolveConflictStartedEvent(EventSource source,
Workspace workspace,
Conflict conflict)
|
Uses of Conflict in com.microsoft.tfs.core.clients.versioncontrol.soapextensions |
---|
Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions that return Conflict | |
---|---|
Conflict |
GetOperation.getMergeDetails()
|
Conflict[] |
Workspace.queryConflicts(ItemSpec[] itemSpecs)
Queries the server for any conflicts in this workspace that match the given filters. |
Conflict[] |
Workspace.queryConflicts(java.lang.String[] pathFilters,
boolean recursive)
Queries the server for conflicts in this workspace that match the given filters. |
Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type Conflict | |
---|---|
int |
ConflictComparator.compare(Conflict c1,
Conflict c2)
Compares two conflicts by server path for display purposes (culture sensitive and case insensitive). |
int |
Conflict.compareTo(Conflict other)
|
void |
Workspace.removeLocalConflict(Conflict conflict)
Removes a local conflict from the server's list of conflicts for this workspace. |
void |
Workspace.removeLocalConflicts(Conflict[] conflicts)
Removes local conflicts from the server's list of conflicts for this workspace. |
void |
Workspace.resolveConflict(Conflict conflict)
|
void |
Workspace.resolveConflict(Conflict conflict,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts)
|
void |
Workspace.resolveConflict(Conflict conflict,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts,
java.lang.String[] itemPropertyFilters)
|
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,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts)
|
void |
Workspace.resolveConflicts(Conflict[] conflicts,
java.lang.String[] itemPropertyFilters,
ResolveErrorOptions errorOptions,
java.util.concurrent.atomic.AtomicReference<Conflict[]> resolvedConflicts)
|
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. |
void |
GetOperation.setMergeDetails(Conflict mergeDetails)
Sets the merge details for this operation. |
Constructors in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type Conflict | |
---|---|
Conflict(Conflict conflict)
Creates a clone of the given conflict. |
Uses of Conflict in com.microsoft.tfs.core.util.diffmerge |
---|
Methods in com.microsoft.tfs.core.util.diffmerge with parameters of type Conflict | |
---|---|
com.microsoft.tfs.util.process.ProcessRunner |
ThreeWayMerge.beginExternalMerge(Conflict conflict,
ExternalTool tool,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
Merges the content that would resolve the given conflict via an external tool the user has configured. |
boolean |
ThreeWayMerge.doInternalMerge(Conflict conflict,
boolean onlyCountConflicts)
Merges the content that would resolve the given conflict. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |