Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

TFS Merge And Keep The Associated Changesets/Comments

Tags:

tfs

So let's say I'm working in a development branch and I checked in a change, supplied a comment, and associated a work item. Now I want to merge that back to Main, is there a way I can have TFS merge know to associate that same work item and comment by default when I attempt to check it in?

Seems trivial but scale this out to multiple changesets a day and recording the work item numbers to reselect gets very tedious...

like image 463
RailRhoad Avatar asked Jan 24 '12 18:01

RailRhoad


People also ask

How do I merge changesets in another branch?

Use the drag and drop operation to merge branches You can use the drag and drop feature to merge a changeset or a branch to another branch. For more information, see Merge folders and files.

How do I edit changeset comments in TFS?

Click on the Changeset [number] link for the changset you are interested in. Above the changeset details panel click on the little speech bubble with the plus sign, a textbox will appear and you can enter your comment - hitting Enter will save the comment.


1 Answers

TFS has in my opinion a weakness on this one. All TFS-guides out there suggest that a multiple-branch scheme should be applied - which is absolutely reasonable (see here for a great reference).
Developers shall be working in 'playground' branches & once tests have succeeded, changesets are propagated into moree stable - more Release-near branches.

A somewhat duplicate question on that is this one.

According to the answers, an extension by J.Ehn could do what you 're after on the link-to-WI aspect. No evidence shows that the add-comments aspect is somehow included - yet this might not make tremendous sense (what should happen if the merge contains multiple commits from the \DEV-branch?). Still, it should be possible to fork this implementation and add the comments as well.

In the same question E.Blankenship provides with a rough road to another alternative.

like image 199
pantelif Avatar answered Oct 04 '22 05:10

pantelif