TFS Work Items Tracking

Leave a comment

In the following posts I will be posting the topics related to TFS work Items Tracking

Advertisements

Leftovers-Associate a File Type with a Merge Tool

Leave a comment

Do you know that you can associate a file type with a Merge Tool? Here is how you can do that:

1. Open Visual Studio

2. Tools – Options

image

3. Source Control – Visual Studio Team Foundation Server – Click on Configure Tools

image

4. Click Add in the Configure User Tools…

image

5. Configure the tool you wish to use and click OK – I have configured WinMerge

image

Note: It should have 4 Arguments, to see or to add more Arguments – click on the arrow next to the Arguments.

6. It looks like as shown in the below screen shot

image

7. All the merges will be done using the WinMerge from now-onwards.

Leftovers

Leave a comment

Anything we left in the below posts, I will continue to post under the topic Leftovers.

Thank you.

Deep dive into Merging-Baseless Merge

Leave a comment

Using Visual Studio only Forward Integration and Backward Integration are possible, but a baseless merge is not available. A baseless merge is done between the branches which are siblings or branches not directly child branches.

As defined in MSDN, a baseless merge “performs a merge without a basis version. That is, allows the user to merge files and folders that do not have a branch/merge relationship. After a baseless merge, a merge relationship exists and future merges do not have to be baseless”.

The below diagram taken from MSDN shows the different merge types:

image

Here are the steps to perform a baseless merge:

1. Open Visual Studio command prompt

2. Execute the below command

Tf merge /baseless <<source path>> <<target path>> /recursive 
 
Example:

image

Displays the Conflicts window, resolve the merge and checkin the changes

image

Some more Examples (from MSDN)

Tf merge /baseless c:\data\proj1 c:\data proj2 /recursive
 
tf merge /baseless c:\data\proj1 c:\data\proj2 /recursive /version:C123~C125
 
Visualization of a baseless Merge:

image

Deep dive into Merging-Timeline Tracking

Leave a comment

Here are the steps:

1. Open the Source Control Explorer

2. Select the File or Folder and Click on History

image

3. Select ChangeSet and click on Track

image

4. Select the branches you want to track

image

5. Click on the Timeline Tracking

image

6. Displays Timeline Tracking Visualization

image

Deep dive into Merging-Visual Merge

Leave a comment

Using the History window we can do a Visual Merge.

1. Open the Source Control Explorer

2. Select the File or Folder and Click on History

image

3. Select ChangeSet and click on Track

image

4. Select the branches you want to track

image

5. If any branch is not merged, then select the branch and drag and drop to the other branch, when you drag and drop it turns into a + (plus sign) and drop onto “To” branch.

image

6. It opens the Merge Wizard – complete the Merge by following the steps, and checking the changes using the Pending Changes Window.

image

7. After the merge click on the Rerun in the History Window Toolbar

image

8. Select the branches to be tracked for merges and click on Visualize, it displays the Tracks

image

Deep dive into Merging-Tracking the Merges

Leave a comment

To find out that a change done in file or folder in one branch whether it is merged to another branch or not? is known as Tracking the Merges. As we all know each change is a ChangeSet. We will be tracking whether a change set is merged or not?

Here are the steps:

1. Open the Source Control Explorer

2. Select a file or folder whose changes you want to track

3. Click on History from the Source Control Toolbar

image

4. In the History Window – Select a Changeset and click on Track ChangeSet

image

5. It displays the Visualization Dialog box, select the branches which are to be tracked.

image

6. It displays the tracking Visualization. It does not display the messages, but it displays with Green color if the changes are merged. Will be greyed in case not merged.

The below screen shot shows, that the Changeset 2415 is merged to Correction branch ChangeSet 2416. The same Changeset of 2415 is not merged to Increment.

image

Older Entries