index > Team Foundation Server - Version Control > finding out what changeset differs between two branches

finding out what changeset differs between two branches


Anyone knows of a tool that can compare two tfs/sc branches and report the changeset's that differ between them?
GT_MSDN
tf merge /candidate $/project/branch1 $/project/branch2
Richard Berg MSFT

Thanks for the answer. Now when I got it I realize that my question was not detailed enough so let me explain:

I have a "main" tfs/sc branch from which I create a branch, e.g. on a label, and I name the branch "w637".

Now I checkout and update some files on "main", I checkin and they get the changeset number #2376

Then I make a merge from "main" to "w637". I select merge by changeset and I get a list of all changesets that have been added to "main" but not to "w637", among them I find changeset #2376 which i select and i finalize the merge. When I check in the merged update I get a new changeset number #2488

Now I repeat the merge by changeset operation just to verify that changeset #2376 is no longer listed and it is not. II am pleased, my changeset #2376 was merged to "w637" and is no longer listed as a merge cadidate. Obviosly TFS/SC keeps track of what changeset's have been merged to what branch, which is fine!

BUT! Now when I make a view history on branch "w637" I cannot see any trace of #2376. I can see #2488 which was the changeset id I got when I checked in my merge of #2376 (but there is no connection shown between the two)

What I would like to have is a "view merged changesets from branch x to branch y" possibility. The information is there, see my "Obviosly" sentence above. Is there a tool in STF that can give such information?

Thanks

GT_MSDN
Yes. tf merges $/project/branch1 $/project/branch2
Richard Berg MSFT

The tf tool (and the api) seems to have most of the required functions that are not available in the Team Explorer.

Thanks for your help,

GT_MSDN
reply 5

You can use google to search for other answers

 

More Articles

Restrict access to all top level folders in Team Project
Can I modify behaviour of get operation by writing some pugin to ...
TFS API - using ASP.net to checkout the file and modify and check...
Version Control of Database Schemas
How-to Remove or reattach TFS Version Control repository?
Installing TFS MSSCCI Provider
Can I merge two branch manually?
Check-in Policy
Discrepancy when files are deleted
Multiple Source control Databases in TFS
Welcome to Bokebb   New Update   Joins the collection  
 

New Articles

Re: Can't undo CreateTeamProjectFolder()
TFS Folder Renames...
tf get latest to a specific location
How to undo the check-out in case the de…
TF14087: Cannot undelete...because not a…
Source control check type
VssConverter problem
UI Bug
How to restore the mistakenly dele…
No changes to merge message
Visual studio locking up when doing TFS …
How to answer some user questions
VS2003 + Visual Source Safe upgrade ques…
Is it a recommended practice using Sourc…
Problem with Automatically added Locks

Hot Articles

"Keep checked out" on check-in
Enable Code Analysis make me miserable
VSTS and database object version control
Binding trouble when migrating VS2003 So…
Team Foundation Server MSSCCI With Visua…
Working directory configuration
Sharing common components across project…
Error: Failed to load the work item hist…
how to delete the file or folder in v…
Official data about overhead and perform…
Version control for web site
Error: Can't Load Checkin Policies from …
Undo Check Out of another user
How do I / Can I list files within a Cha…
Cannot auto-merge when two consecutive l…

Recommend Articles

Locking a Label
How to setup TFS MSSCCI plugin to connec…
Massive confusion here...
automated release notes
More than just VSS 2005?
How to handle large numbers of projects …
Latest updates are reflected to the server
Error in VS2005 on Get Latest command
Project deletion and Branches
Team Projects Check-in Policy for manage…
Msscci and sprax enterprise architect
Change Local Path after download files f…
GET does not actually retrieve any files
Check In: Operation not performed
Trying to get Merged Changesets history …