Home/ Questions/Q 782869
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-14T20:27:15+00:00

I have two TFS branches that do not have a direct parent/child relationship in

  • 0

I have two TFS branches that do not have a direct parent/child relationship in TFS. In a certain revision, 94 in my example, several items were deleted. I have been tasked with applying those deletes to the main branch. I’d like to do so through a baseless merge. I tried the following command to do so:

tf merge /baseless /recursive /version:94 .\programs\program1 ..\Release\programs\program1

Most of the items in the tree were marked as “merge”, and some were marked as “merge edit”. However, none of the items were deleted at the destination. On a whim i tried to merge over a single delete like so:

tf merge /baseless /recursive /version:94 .\programs\program1\source1.cs ..\Release\programs\program1\source1.cs

I got the following error message:

The item [TFS_PATH] does not exist at the specified version.

How do I do this? Is there a way to avoid making all those deletes myself?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    I experimented a bit and here is my version of the above. seems to work for me:

    get-tfsChangeset xx |% {$_.changes} |? {($_.changetype -band $tfs.VCS_ChangeType::delete) -ne 0 } |% {$_.item.serverItem -replace "\$/branch1","$/branch2"} |  Add-TfsPendingChange -delete

    to make it even more useful, one can parametrize the changeset number and branch paths to allow for more convenient processing.

    for example, to process all deletes in a given branch run this from the source location:

    $sourcePath="\$/MySourcePath"
$destPath="$/MydestPath"

 Get-TfsItemHistory ./*.sql -r -IncludeItems  | %{$_.changes} |
 ? {($_.changetype -band $tfs.VCS_ChangeType::delete) -ne 0 } |
 % {$_.item.serverItem -replace $sourcePath,$destPath} |  Add-TfsPendingChange -delete
    • 0