james_cline_

Is there a way to get code shelved from branch A easily into branch B



Re: Team Foundation Server - Version Control Unshelve to different branch

Richard Berg MSFT

Not at the moment. It will probably be in a future Power Tool but we haven't released it yet.




Re: Team Foundation Server - Version Control Unshelve to different branch

Drew Marsh

Just jumping on the bandwaggon here to say this would be a great tool to have. Sometimes we start things in an existing branch and then decide "uhh, we better start a separate branch for this" and then we have to manually reconcile the shelf.

Cheers,
Drew





Re: Team Foundation Server - Version Control Unshelve to different branch

David_Reynolds

Include me on the bandwagon too.




Re: Team Foundation Server - Version Control Unshelve to different branch

cmcdonaldca

me too ;)



Re: Team Foundation Server - Version Control Unshelve to different branch

WXS123

Add me to this list, we have hit this several times already...





Re: Team Foundation Server - Version Control Unshelve to different branch

murk

We need that feature too.



Re: Team Foundation Server - Version Control Unshelve to different branch

Marc T

Just hit this exact scenario for the second time, any progress on getting a power tool out for it




Re: Team Foundation Server - Version Control Unshelve to different branch

Alex Boesel

Conceptually, assuming you've modified version X of branch A, and then branch B is cut off of a later version Y, you'd want to do a 3 way merge of:

Base: X in branch A

Branch 1: Shelf contents

Branch 2: Y in branch B

...right

Is all this information available through the TFS APIs (shelveset workspace version, specifically) I've never considered writing an extension, but people at work bug me all the time about it and it causes a lot of bad blood between devs and TFS--which I actively try to minimize since I love the system.

Thanks!





Re: Team Foundation Server - Version Control Unshelve to different branch

Richard Berg MSFT

Yes, you can do all of this from the TFS APIs. In fact, every power tool we've released so far has used nothing but public APIs. Rest assured this one is on our list...