Repository4


Click here for a complete list of operations.

Merge

Test

The test form is only available for requests from the local machine.

SOAP 1.1

The following is a sample SOAP 1.1 request and response. The placeholders shown need to be replaced with actual values.

POST /_tfs_resources/VersionControl/v4.0/Repository.asmx HTTP/1.1
Host: dev.pikacom.com
Content-Type: text/xml; charset=utf-8
Content-Length: length
SOAPAction: "http://schemas.microsoft.com/TeamFoundation/2005/06/VersionControl/ClientServices/03/Merge"

<?xml version="1.0" encoding="utf-8"?>
<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
  <soap:Body>
    <Merge xmlns="http://schemas.microsoft.com/TeamFoundation/2005/06/VersionControl/ClientServices/03">
      <workspaceName>string</workspaceName>
      <workspaceOwner>string</workspaceOwner>
      <source item="string" recurse="None or OneLevel or Full" did="int" />
      <target item="string" recurse="None or OneLevel or Full" did="int" />
      <from />
      <to />
      <lockLevel>None or Checkin or CheckOut or Unchanged</lockLevel>
      <optionsEx>int</optionsEx>
      <itemPropertyFilters>
        <string>string</string>
        <string>string</string>
      </itemPropertyFilters>
      <itemAttributeFilters>
        <string>string</string>
        <string>string</string>
      </itemAttributeFilters>
    </Merge>
  </soap:Body>
</soap:Envelope>
HTTP/1.1 200 OK
Content-Type: text/xml; charset=utf-8
Content-Length: length

<?xml version="1.0" encoding="utf-8"?>
<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
  <soap:Body>
    <MergeResponse xmlns="http://schemas.microsoft.com/TeamFoundation/2005/06/VersionControl/ClientServices/03">
      <MergeResult>
        <GetOperation type="Any or Folder or File" itemid="int" slocal="string" tlocal="string" sitem="string" titem="string" sver="int" vrevto="int" lver="int" did="int" chgEx="int" chg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" lock="None or Checkin or CheckOut or Unchanged" il="boolean" pcid="int" cnflct="boolean" cnflctchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" cnflctchgEx="int" cnflctitemid="int" nmscnflct="unsignedByte" durl="string" enc="int" vsd="dateTime">
          <HashValue>base64Binary</HashValue>
          <Properties>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </Properties>
          <PropertyValues>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </PropertyValues>
        </GetOperation>
        <GetOperation type="Any or Folder or File" itemid="int" slocal="string" tlocal="string" sitem="string" titem="string" sver="int" vrevto="int" lver="int" did="int" chgEx="int" chg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" lock="None or Checkin or CheckOut or Unchanged" il="boolean" pcid="int" cnflct="boolean" cnflctchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" cnflctchgEx="int" cnflctitemid="int" nmscnflct="unsignedByte" durl="string" enc="int" vsd="dateTime">
          <HashValue>base64Binary</HashValue>
          <Properties>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </Properties>
          <PropertyValues>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </PropertyValues>
        </GetOperation>
      </MergeResult>
      <failures>
        <Failure req="None or Add or Branch or Encoding or Edit or Delete or Lock or Rename or Undelete or Property" code="string" sev="Error or Warning" computer="string" ident="string" local="string" res="string" item="string" itemid="int" ws="string" owner="string">
          <Warnings>
            <Warning xsi:nil="true" />
            <Warning xsi:nil="true" />
          </Warnings>
          <Message>string</Message>
        </Failure>
        <Failure req="None or Add or Branch or Encoding or Edit or Delete or Lock or Rename or Undelete or Property" code="string" sev="Error or Warning" computer="string" ident="string" local="string" res="string" item="string" itemid="int" ws="string" owner="string">
          <Warnings>
            <Warning xsi:nil="true" />
            <Warning xsi:nil="true" />
          </Warnings>
          <Message>string</Message>
        </Failure>
      </failures>
      <conflicts>
        <Conflict cid="int" pcid="int" ychg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ychgEx="int" ysitem="string" ysitemsrc="string" yenc="int" yprop="int" ytype="Any or Folder or File" yver="int" yitemid="int" ydid="int" ylchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ylchgEx="int" ylmver="int" bsitem="string" benc="int" bprop="int" bitemid="int" bver="int" bhash="base64Binary" bdid="int" btype="Any or Folder or File" bchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" bchgEx="int" titemid="int" tver="int" tsitem="string" tenc="int" tprop="int" thash="base64Binary" tdid="int" ttype="Any or Folder or File" tlmver="int" tverf="int" tctyp="int" isc="boolean" tsn="string" tson="string" srclitem="string" tgtlitem="string" ctype="None or Get or Checkin or Local or Merge or Unknown" reason="int" isnamecflict="boolean" isforced="boolean" res="None or AcceptMerge or AcceptYours or AcceptTheirs or DeleteConflict or AcceptYoursRenameTheirs or OverwriteLocal" isresolved="boolean" bdurl="string" tdurl="string" ydurl="string" copt="int" />
        <Conflict cid="int" pcid="int" ychg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ychgEx="int" ysitem="string" ysitemsrc="string" yenc="int" yprop="int" ytype="Any or Folder or File" yver="int" yitemid="int" ydid="int" ylchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ylchgEx="int" ylmver="int" bsitem="string" benc="int" bprop="int" bitemid="int" bver="int" bhash="base64Binary" bdid="int" btype="Any or Folder or File" bchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" bchgEx="int" titemid="int" tver="int" tsitem="string" tenc="int" tprop="int" thash="base64Binary" tdid="int" ttype="Any or Folder or File" tlmver="int" tverf="int" tctyp="int" isc="boolean" tsn="string" tson="string" srclitem="string" tgtlitem="string" ctype="None or Get or Checkin or Local or Merge or Unknown" reason="int" isnamecflict="boolean" isforced="boolean" res="None or AcceptMerge or AcceptYours or AcceptTheirs or DeleteConflict or AcceptYoursRenameTheirs or OverwriteLocal" isresolved="boolean" bdurl="string" tdurl="string" ydurl="string" copt="int" />
      </conflicts>
      <changePendedFlags>int</changePendedFlags>
    </MergeResponse>
  </soap:Body>
</soap:Envelope>

SOAP 1.2

The following is a sample SOAP 1.2 request and response. The placeholders shown need to be replaced with actual values.

POST /_tfs_resources/VersionControl/v4.0/Repository.asmx HTTP/1.1
Host: dev.pikacom.com
Content-Type: application/soap+xml; charset=utf-8
Content-Length: length

<?xml version="1.0" encoding="utf-8"?>
<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
  <soap12:Body>
    <Merge xmlns="http://schemas.microsoft.com/TeamFoundation/2005/06/VersionControl/ClientServices/03">
      <workspaceName>string</workspaceName>
      <workspaceOwner>string</workspaceOwner>
      <source item="string" recurse="None or OneLevel or Full" did="int" />
      <target item="string" recurse="None or OneLevel or Full" did="int" />
      <from />
      <to />
      <lockLevel>None or Checkin or CheckOut or Unchanged</lockLevel>
      <optionsEx>int</optionsEx>
      <itemPropertyFilters>
        <string>string</string>
        <string>string</string>
      </itemPropertyFilters>
      <itemAttributeFilters>
        <string>string</string>
        <string>string</string>
      </itemAttributeFilters>
    </Merge>
  </soap12:Body>
</soap12:Envelope>
HTTP/1.1 200 OK
Content-Type: application/soap+xml; charset=utf-8
Content-Length: length

<?xml version="1.0" encoding="utf-8"?>
<soap12:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://www.w3.org/2003/05/soap-envelope">
  <soap12:Body>
    <MergeResponse xmlns="http://schemas.microsoft.com/TeamFoundation/2005/06/VersionControl/ClientServices/03">
      <MergeResult>
        <GetOperation type="Any or Folder or File" itemid="int" slocal="string" tlocal="string" sitem="string" titem="string" sver="int" vrevto="int" lver="int" did="int" chgEx="int" chg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" lock="None or Checkin or CheckOut or Unchanged" il="boolean" pcid="int" cnflct="boolean" cnflctchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" cnflctchgEx="int" cnflctitemid="int" nmscnflct="unsignedByte" durl="string" enc="int" vsd="dateTime">
          <HashValue>base64Binary</HashValue>
          <Properties>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </Properties>
          <PropertyValues>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </PropertyValues>
        </GetOperation>
        <GetOperation type="Any or Folder or File" itemid="int" slocal="string" tlocal="string" sitem="string" titem="string" sver="int" vrevto="int" lver="int" did="int" chgEx="int" chg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" lock="None or Checkin or CheckOut or Unchanged" il="boolean" pcid="int" cnflct="boolean" cnflctchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" cnflctchgEx="int" cnflctitemid="int" nmscnflct="unsignedByte" durl="string" enc="int" vsd="dateTime">
          <HashValue>base64Binary</HashValue>
          <Properties>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </Properties>
          <PropertyValues>
            <PropertyValue xsi:nil="true" />
            <PropertyValue xsi:nil="true" />
          </PropertyValues>
        </GetOperation>
      </MergeResult>
      <failures>
        <Failure req="None or Add or Branch or Encoding or Edit or Delete or Lock or Rename or Undelete or Property" code="string" sev="Error or Warning" computer="string" ident="string" local="string" res="string" item="string" itemid="int" ws="string" owner="string">
          <Warnings>
            <Warning xsi:nil="true" />
            <Warning xsi:nil="true" />
          </Warnings>
          <Message>string</Message>
        </Failure>
        <Failure req="None or Add or Branch or Encoding or Edit or Delete or Lock or Rename or Undelete or Property" code="string" sev="Error or Warning" computer="string" ident="string" local="string" res="string" item="string" itemid="int" ws="string" owner="string">
          <Warnings>
            <Warning xsi:nil="true" />
            <Warning xsi:nil="true" />
          </Warnings>
          <Message>string</Message>
        </Failure>
      </failures>
      <conflicts>
        <Conflict cid="int" pcid="int" ychg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ychgEx="int" ysitem="string" ysitemsrc="string" yenc="int" yprop="int" ytype="Any or Folder or File" yver="int" yitemid="int" ydid="int" ylchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ylchgEx="int" ylmver="int" bsitem="string" benc="int" bprop="int" bitemid="int" bver="int" bhash="base64Binary" bdid="int" btype="Any or Folder or File" bchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" bchgEx="int" titemid="int" tver="int" tsitem="string" tenc="int" tprop="int" thash="base64Binary" tdid="int" ttype="Any or Folder or File" tlmver="int" tverf="int" tctyp="int" isc="boolean" tsn="string" tson="string" srclitem="string" tgtlitem="string" ctype="None or Get or Checkin or Local or Merge or Unknown" reason="int" isnamecflict="boolean" isforced="boolean" res="None or AcceptMerge or AcceptYours or AcceptTheirs or DeleteConflict or AcceptYoursRenameTheirs or OverwriteLocal" isresolved="boolean" bdurl="string" tdurl="string" ydurl="string" copt="int" />
        <Conflict cid="int" pcid="int" ychg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ychgEx="int" ysitem="string" ysitemsrc="string" yenc="int" yprop="int" ytype="Any or Folder or File" yver="int" yitemid="int" ydid="int" ylchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" ylchgEx="int" ylmver="int" bsitem="string" benc="int" bprop="int" bitemid="int" bver="int" bhash="base64Binary" bdid="int" btype="Any or Folder or File" bchg="None or Add or Edit or Encoding or Rename or Delete or Undelete or Branch or Merge or Lock or Rollback or SourceRename or Property" bchgEx="int" titemid="int" tver="int" tsitem="string" tenc="int" tprop="int" thash="base64Binary" tdid="int" ttype="Any or Folder or File" tlmver="int" tverf="int" tctyp="int" isc="boolean" tsn="string" tson="string" srclitem="string" tgtlitem="string" ctype="None or Get or Checkin or Local or Merge or Unknown" reason="int" isnamecflict="boolean" isforced="boolean" res="None or AcceptMerge or AcceptYours or AcceptTheirs or DeleteConflict or AcceptYoursRenameTheirs or OverwriteLocal" isresolved="boolean" bdurl="string" tdurl="string" ydurl="string" copt="int" />
      </conflicts>
      <changePendedFlags>int</changePendedFlags>
    </MergeResponse>
  </soap12:Body>
</soap12:Envelope>