locked
TFPT: Bug in "Rename" and then "Merge ShelveSet" RRS feed

  • Question

  • Here's the scenario:

    You have two branches in the same workspace.

    On one branch you move files into a subfolder (thereby causing a rename in TFS terminology)

    Now you shelve the changes.

    Now you wish to merge the changes to the other branch using tfpt.exe

    tfpt unshelve "My Shelveset Name" /migrate /source:"$/ProjectName/Branch" /target:"$/ProjectName/Targetbranch"

    But instead of replicating the changes of the source branch, TFPT checks out the renamed file as "Add" and leaves the original file untouched.

    Wednesday, September 23, 2015 10:21 AM

Answers

  • Done:

    https://connect.microsoft.com/VisualStudio/feedback/details/1833677/tfpt-bug-in-rename-and-then-merge-shelveset

    Friday, September 25, 2015 11:36 AM

All replies

  • Hi DJDoena, 

    Thanks for your post.

    What’s the version of your TFS and VS?

    If you perform the merge in VS Source Control Explorer, what’s the result? It’s different with tfpt.exe result?


    We are trying to better understand customer views on social support experience, so your participation in this interview project would be greatly appreciated if you have time. Thanks for helping make community forums a great place. Click HERE to participate the survey.

    Thursday, September 24, 2015 3:16 AM
    Moderator
  • > What’s the version of your TFS and VS?

    TFS Server is 2012 or 2013 (the one that came after 2010) - it's a company server so i don't have direct insight. It's definitely not TFS 2015.

    VS is 2010.

    > If you perform the merge in VS Source Control Explorer

    How would one unshelve to a different branch directly in Visual Studio? I've never seen that option in VS 2010 through 2013.

    > Click HERE to participate the survey.

    There's no "here" link

    Thursday, September 24, 2015 12:07 PM
  • Hi DJDoena,

    Thanks for your reply.

    I tested this scenario in my TFS 2012 and TFS 2013 Servers using TFPT unshelve command, they both worked as you said: file shows as ‘add’ in pending changes. For this scenario, please submit it to Microsoft Connect Feedback portal at: https://connect.microsoft.com/VisualStudio. Microsoft engineers will evaluate them seriously.

    Yes, there’s an issue in my signature, and it looks like a content format issue in the forum, I will try to resolve it ASAP. And I share the survey link here: https://support2.microsoft.com/default.aspx?scid=gp;en-us;fmserror&wa=wsignin1.0.


    We are trying to better understand customer views on social support experience, so your participation in this interview project would be greatly appreciated if you have time. Thanks for helping make community forums a great place. Click HERE to participate the survey.

    Friday, September 25, 2015 2:41 AM
    Moderator
  • Done:

    https://connect.microsoft.com/VisualStudio/feedback/details/1833677/tfpt-bug-in-rename-and-then-merge-shelveset

    Friday, September 25, 2015 11:36 AM