com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions
Class AutomergeWritableConflictResolution
java.lang.Object
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.ConflictResolution
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.AutomergeWritableConflictResolution
public class AutomergeWritableConflictResolution
- extends ConflictResolution
AutomergeWritableConflictResolution
handles the special type of
conflict resolution for automerging writable conflicts. In particular, we
must delete the conflict on the server, then do a get of the file on the
requested version. This will produce new version conflicts, which we can
automerge.
- Since:
- TEE-SDK-10.1
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.ConflictResolution |
addStatusListener, cancel, getConflictDescription, getDescription, getErrorMessage, getHelpText, getStatus, needsEncodingSelection, needsNewPath, removeStatusListener, resolveConflict, setErrorMessage, setStatus |
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
AutomergeWritableConflictResolution
public AutomergeWritableConflictResolution(ConflictDescription conflictDescription,
java.lang.String description,
java.lang.String helpText)
newForConflictDescription
public ConflictResolution newForConflictDescription(ConflictDescription conflictDescription)
- Specified by:
newForConflictDescription
in class ConflictResolution
setNewPath
public void setNewPath(java.lang.String newPath)
- Description copied from class:
ConflictResolution
- Sets the server name of the resultant merged file. This should be called
only if
ConflictResolution.needsNewPath()
returns true.
- Specified by:
setNewPath
in class ConflictResolution
- Parameters:
newPath
- The new (server) file path
setEncoding
public void setEncoding(FileEncoding newEncoding)
- Description copied from class:
ConflictResolution
- Sets the file encoding of the resultant merged file. This should be
called only if
ConflictResolution.needsEncodingSelection()
returns true.
- Specified by:
setEncoding
in class ConflictResolution
- Parameters:
newEncoding
- The new FileEncoding
work
protected ConflictResolutionStatus work()
throws java.lang.Exception
- Specified by:
work
in class ConflictResolution
- Throws:
java.lang.Exception
getConflicts
public Conflict[] getConflicts()
- Description copied from class:
ConflictResolution
- Queries the conflict resolver for any new conflicts which arised during
the resolution of this conflict. (Typically only used by automerge
writable conflicts.)
- Overrides:
getConflicts
in class ConflictResolution
- Returns:
- A list of new conflicts or null
© 2015 Microsoft. All rights reserved.