Alex Rivera | Logout

TFS Loses History when Merging

Asked 2009-07-15T12:40:03.343
10

Both Team Foundation Server (TFS) 2005 and 2008 lose history (check-ins + comments) on files when they branched and merged back. So e.g. if changes in a branch are made then merged back to the root branch, none of the changes made in the branch are visible in the root branch. The only thing visible in the history states that a merge occurred.

Does anyone know if there is an option which can be set to retain the history, or a different way to do the merge which keeps the history?

Edit
Report

1 Answer

2

TFS Branched History plugin for VS2010 is now available from Microsoft Gallery: http://visualstudiogallery.msdn.microsoft.com/7d4f37b6-f9a4-44c6-b0a0-994956538a44 This plugin is just query history from different branches and make union of the records.

answered 2011-09-19T13:46:10.887

Your Answer