通过

RepositoryExtensions.Merge 方法

  • 项目

返回为挂起的合并自动解决的 GetOperations 和冲突，则不自动解析的列表。

命名空间：  Microsoft.TeamFoundation.VersionControl.Server
程序集：  Microsoft.TeamFoundation.VersionControl.Server（在 Microsoft.TeamFoundation.VersionControl.Server.dll 中）

语法

声明
<WebMethodAttribute> _
Public Function Merge ( _
    workspaceName As String, _
    workspaceOwner As String, _
    source As ItemSpec, _
    target As ItemSpec, _
    from As VersionSpec, _
    to As VersionSpec, _
    lockLevel As LockLevel, _
    optionsEx As Integer, _
    <OutAttribute> ByRef failures As StreamingCollection(Of Failure), _
    <OutAttribute> ByRef conflicts As StreamingCollection(Of Conflict), _
    propertyNameFilters As String(), _
    <OutAttribute> ByRef changePendedFlags As Integer _
) As StreamingCollection(Of GetOperation)

[WebMethodAttribute]
public StreamingCollection<GetOperation> Merge(
    string workspaceName,
    string workspaceOwner,
    ItemSpec source,
    ItemSpec target,
    VersionSpec from,
    VersionSpec to,
    LockLevel lockLevel,
    int optionsEx,
    out StreamingCollection<Failure> failures,
    out StreamingCollection<Conflict> conflicts,
    string[] propertyNameFilters,
    out int changePendedFlags
)

参数

  • optionsEx
    类型：System.Int32
    用于向服务器发送新的和旧的合并选项。值是 MergeOptionsEx 枚举。
  • propertyNameFilters
    类型：array<System.String[]
    要返回的每一获取操作的属性列表。

返回值

类型：Microsoft.TeamFoundation.Framework.Server.StreamingCollection<GetOperation>
更新客户端的 GetOperations 的列表。

.NET Framework 安全性

请参见

参考

RepositoryExtensions 类

Microsoft.TeamFoundation.VersionControl.Server 命名空间