Work items and merging streams

I don't think there is an easy way to find all the change sets with resolved work items. You may want to open an enhancement for this feature. It may also be possible to write your own tool with the SDK to help with this.

An alternative would be your team only delivering changes when the work item is resolved. Although, it sounds like that would defeat the purpose of your pre-integration stream.

Actually I solved this one yesterday, go to the work item page, then to the links associated with a work item select the change set you want to merge, and apply it's files as a patch to the stream. It is a little confusing but it seems to work.

Just to make sure you are heading in the right direction, can you expand
a bit on what you mean by "apply its files as a patch to the stream"?

Cheers,
Geoff

On 5/24/2011 10:53 AM, andrewd wrote:

Actually I solved this one yesterday, go to the work item page, then
to the links associated with a work item select the change set you
want to merge, and apply it's files as a patch to the stream. It is a
little confusing but it seems to work.

Actually I solved this one yesterday, go to the work item page, then to the links associated with a work item select the change set you want to merge, and apply it's files as a patch to the stream. It is a little confusing but it seems to work.

Looking at each work item sounds like the tedious method I assumed you were trying to avoid. I thought you wanted something more like a query of the component history to give back a list of change sets that have resolved work items associated.

If this works for you, you can create a workspace from the pre-integration stream and flow it to the integration stream. In Pending Changes, you can expand each outgoing change set to see the associated work items. The work item node will look different if it is closed (Windows - I believe the description has a strikeout and is grey, Linux - only icon is greyed out). Select all the change sets that you see with closed work items and deliver (it's possible that you may have gaps if you're selectively delivering change sets).

@gmclemm To apply a file as a patch you select a change set associated with a work item and open it in the change explorer. Then expand the set all the way and right click one of the files in that set, select new->Patch. Then in the pending changes window you can change the flow target of the patch before merging it into a workspace.

@tmok, I was looking for a way to retrive a change set that had already been delivered, based on the work item. And also to be able to seperate only closed work items, From what I have seen the method you suggest would not let me pick and choose from delivered change sets, only pendiong changes.

Are you trying to pull out change sets that have been delivered to integration? My understanding is you want to deliver change sets with closed work items from pre-integration to integration. If you create a workspace from pre-integration and try to flow it to integration, you'll see the change sets in pre-integration that you can deliver to integration.

From what you've described about the patches and retrieving already delivered change sets, it sounds like you've created a workspace from the integration stream. This is also correct but you'll be accepting instead of delivering. If you flow the workspace with pre-integration, you'll accept changes that have closed work items. There isn't really a need to create a patch. When you accept and there are conflicts, you can resolve and it will create a new change set with the merges. Then you'll be able to accept the change set from pre-integration. After you've merged all the changes, switch the flow target to integration and deliver the changes.