|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.microsoft.tfs.util.BitField
com.microsoft.tfs.core.clients.versioncontrol.MergeFlags
public class MergeFlags
MergeFlags
is used to control the options of a merge operation. These
flags were introduced in 2010, superseding MergeOptions
in this API.
Field Summary | |
---|---|
static MergeFlags |
ALWAYS_ACCEPT_MINE
Instructs the server to discard any changes from the source, keeping only changes from the target. |
static MergeFlags |
BASELESS
Instructs the server to perform a baseless merge between items |
static MergeFlags |
CONSERVATIVE
Instructs the server to be conservative while declaring merges as conflicts. |
static MergeFlags |
FORCE_MERGE
Instructs the server to re-merge source versions which have been previously merged |
static MergeFlags |
NO_AUTO_RESOLVE
Used only on the client. |
static MergeFlags |
NO_IMPLICIT_BASELESS
Only works prior on TFS 2008, instructs the server to not implicitly baseless merge items with the same relative path from the source root and target root. |
static MergeFlags |
NO_MERGE
Instructs the server to not actually pend the merge, but just return a preview of what needs to be merged |
static MergeFlags |
NONE
|
static MergeFlags |
SILENT
Instructs the server to supress any get operations and conflicts. |
Method Summary | |
---|---|
MergeFlags |
combine(MergeFlags other)
|
static MergeFlags |
combine(MergeFlags[] values)
|
boolean |
contains(MergeFlags other)
|
boolean |
containsAll(MergeFlags other)
|
boolean |
containsAny(MergeFlags other)
|
MergeFlags |
remove(MergeFlags other)
|
MergeFlags |
retain(MergeFlags other)
|
com.microsoft.tfs.core.clients.versioncontrol.soapextensions.internal.MergeOptions |
toMergeOptions()
Converts this MergeFlags to the legacy (TFS 2008 and previous)
MergeOptions type for use with the older web service. |
Methods inherited from class com.microsoft.tfs.util.BitField |
---|
combine, combineInternal, containsAllInternal, containsAnyInternal, containsInternal, equals, fromStringValues, getCombinedSpecialFlags, hashCode, isEmpty, registerStringValue, registerStringValue, removeInternal, retainInternal, toFullStringValues, toIntFlags, toString, toStringValues |
Methods inherited from class java.lang.Object |
---|
clone, finalize, getClass, notify, notifyAll, wait, wait, wait |
Field Detail |
---|
public static final MergeFlags NONE
public static final MergeFlags FORCE_MERGE
public static final MergeFlags BASELESS
public static final MergeFlags NO_MERGE
public static final MergeFlags ALWAYS_ACCEPT_MINE
public static final MergeFlags SILENT
public static final MergeFlags NO_IMPLICIT_BASELESS
public static final MergeFlags CONSERVATIVE
public static final MergeFlags NO_AUTO_RESOLVE
Method Detail |
---|
public static MergeFlags combine(MergeFlags[] values)
public com.microsoft.tfs.core.clients.versioncontrol.soapextensions.internal.MergeOptions toMergeOptions()
MergeFlags
to the legacy (TFS 2008 and previous)
MergeOptions
type for use with the older web service.
MergeOptions
with the options set which correspond to
supported MergeFlags
set in this objectpublic boolean containsAll(MergeFlags other)
public boolean contains(MergeFlags other)
public boolean containsAny(MergeFlags other)
public MergeFlags remove(MergeFlags other)
public MergeFlags retain(MergeFlags other)
public MergeFlags combine(MergeFlags other)
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |