Mapping Between Branches

Sep 13, 2010 at 4:55 PM

I have a scenario I was hoping you could provide some guidance on.   I have the following folder in my Main branch


It then branches to a release like the following


Mainline moves the code to


However the underlying files are pretty close to the same structure.   If I makes changes in the Release1.0 branch is there any way for me to get TFS to recognize that they have moved to the "Deployment" folder in Main?  So when I RI back to Main it will put the changes in the "Deployment" folder.  Or will TFS never know that those two locations are effectivly the same?  I feel I must also state that there is more than just one folder in the branch.


Sep 13, 2010 at 5:20 PM

What version of TFS are you using.

If I correctly understand what you have done, you have moved code in the Main branch from one folder to another. I believe this effectively deletes the files from the source folder of the move (Installation) and adds the files to the target folder of the move (Deployment). TFS will not automatically recognize that the files have moved from one folder to another and *adjust* automatically. I don't think TFS will ever know that these folders are the same (unless you did a rename rather than a move).

I should also caution you that one of the biggest headaches I have encountered is around file renaming, and / or file deletes and adds with the same name. This especially challenging in TFS 2008, but also manifests issues when migrating from TFS 2008 to TFS 2010,

Would it have been better to rename the Installation folder to Deployment (perhaps in both the main as well as the release branches)?

Bill Heys
VS ALM Ranger

Sep 13, 2010 at 5:23 PM

Sorry this was TFS2010.   I had used the "Move" command.  At first I didnt think it worked but upon further investigation it seems that TFS keeps track of that move in main and this does work.   Provided you use the "Move" command and not simply delete and re-add. 

Sep 13, 2010 at 5:28 PM

Yes.. given that you did a move with TFS 2010 it should know what happened.

Thanks for your response.

Bill Heys