index > Team Foundation Server - Version Control > Merging Labels

Merging Labels


I have a label that touches several files in two different changesets. I want to use that label for a merge. The VS IDE gives me an error message "No items match $<path> in the label myLabel@$/<path>".

So then I figured this could only be handled with the command line merge. I tried this:

tf merge /recursive /version:LmyLabel /preview /noprompt $<frompath> $<topath>

And it gives me essentially the same error.

If I ask TFS about the label "myLabel," it gives me a nice description of the files that are in it. Then I decided to try the command line merge using a changeset spec that is synonimous with that label (e.g. C305~C306). This worked.

So is the final conclusion that TFS can't merge a label?




-Brent Arias
Mystagogue
My guess is that $<frompath> is not included in the label. It's not good enough to include some of its children -- the root must be included for it to work.
Richard Berg MSFT

The $<frompath> was the immediate parent directory that contains all files with this label. As such, nothing was implicitly omitted. And the changeset-based merge, using the exact same "from" and "to" path, worked fine - getting every single file that the label had referenced (since that label consisted of precisely the two changesets I chose in the version spec).

In short, merging labels evidently isn't operative.




-Brent Arias
Mystagogue
Not sure what you mean by "operative." I'll admit that merging by label -- we call it an "intersection merge" -- is complex. If we added more intelligence, eg to implicitly add the root to the label in cases like yours where it seems unambiguous, it would just become even more complex.
Richard Berg MSFT
reply 4

You can use google to search for other answers

 

More Articles

2 TFS Project - 1 Source Control Root
Visual studio locking up when doing TFS stuff.
Lock Up Issuses w/ Source Control Explorer
VSS Converter throwing error.
Can anyone remove the workspace which created by Administrator?
Workflow question: Automatic Merges
Mapping a new Team Project to a non-root source control folder
Create and add to SC custom solution
merge /discard command problem
TF.EXE label by workspace
Welcome to Bokebb   New Update   Joins the collection  
 

New Articles

Set check-in policy on folder level
Putting SQL Server DB Objects under Vers…
Generate list of merge conflict
Getting latest version...
TFS Version Control workspace structure
"Add" operations not appearing…
Severe delay when right clicking larger …
Visual studio locking up when doing TFS …
check out all items programatically C#
TF61002 CQConverter: Unknnown Migration …
Team Foundation Version Control Command …
Check-in Policy
Undoing exclusive checkouts
Check-in programatically
Restrict access to all top level folders…

Hot Articles

Programming against MSSCCI provider
Undo unshelve
Putting SQL Server DB Objects under Vers…
Re: Can't undo CreateTeamProjectFolder()
"Add Files" option greyed out
Team Projects Check-in Policy for manage…
Team Explorer Bug - Get Latest on Check-…
MSSCCI Provider and SQL Management Studio
Is it possible to use the api to add a l…
branching files twice to the same branch
Problem with MSSCCI using VB6
TF60096 error migrating using VssConverter
Getting latest versions for non-labeled …
Cannot create new build type on TFS clie…
ICommonStructureService CreateProject

Recommend Articles

File Date in TFS-VC
MSSCCI Provider for TFS Prompts for a Us…
Why does TFS's Version Control employ fo…
Zero-byte Files After Performing "G…
MSSCCI 2003 Install Question
Deep history - anyway to get it all?
Error in VS2005 on Get Latest command
VssConverter problem
Merge operation created a folder behind …
Using Team System for doc management?
Organizing multiple applications with sh…
Msscci provider 1.1 is out!
Merging from one branch to another
Team Foundation Server SCC Api
How to handle large numbers of projects …