Merge deletions in Team Foundation Server without reason

Question

I have two TFS branches that do not have a direct parent / child relationship in TFS. In a specific version 94 in my example, several items were deleted. I was instructed to apply these deletions to the main branch. I would like to do this through a baseless merger. I tried the following command:

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 unite on one deletion, for example:

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

The following error message appeared:

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

How can I do it? Is there a way to avoid all of these deletions?

Answer 1

, . , :

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

, , .

, :

$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

Answer 2

, , . , , " ". Baseless, , diff. , , (, , ). diffa , , , , TFS .

, №, , .

$tfs = Get-TfsServer -path . -all
$deletes = get-tfschangeset 94 | % { $_.changes } | ? { ($_.changetype -band $tfs.VCS_ChangeType::delete) -ne 0 } | % { $_.serveritem }
($deletes -replace "$/branch1" "$/branch2") | Add-TfsPendingChange -delete 

[, ]

Answer 3

Documentation on templates and practice implies that you will have to resolve merge conflicts yourself. (Caution: I have not tried this.)

EDIT: PS See Also In the Morning after a failed TFS merge .