Walkthrough: Advanced Functionality of Source Control

Article
09/24/2007

This walkthrough demonstrates using branches, merges, and labels in Team Foundation source control.

Before proceeding with this walkthrough, it is important to have a fundamental understanding of branching, merging, and applying labels to source control items:

Branching Branching in Team Foundation source control copies a specified set of files and folders on the Team Foundation server to a new location known as a branch. In essence, a branch creates new folders or files based on existing ones. Branching preserves the history of the folders and files that you are branching and allows changes to be merged from the old files to the new ones. Branching can be conducted through Source Control Explorer, or from the command line using the Branch Command. For more information, see Understanding Branching.
Merging Merging is the process of combining two distinct versions of files, folders, or team projects located in separate branches. One branch is the source branch and the other is the target branch. The source branch contains the items that you wish to merge into the target branch. These folder and file versions can be based on changesets, dates, labels, workspaces, or the latest version. For more information, see Understanding Branching. Merging can be conducted through Source Control Explorer, or from the command line using the Merge Command.
Labeling A label is a marker that you can attach selectively to a set of otherwise unrelated files and folders in your source control server to facilitate their collective retrieval to a workspace for either development or build purposes.

The procedures below will step you through performing a branch operation and then editing a team member's files in the resulting branch as well as the original branch. These edits will then be checked in and a merge will be performed. The merge will identify conflicts and you will resolve these conflicts. Additionally, you will also conduct the steps required to apply labels to a changeset in the final procedure.

Prerequisites

Before you can complete this walkthrough you must:

Specify a Team Foundation server. For more information about how to connect to a Team Foundation server, see How to: Connect to Team Foundation Server.
Open an existing team project. For more information, see Walkthrough: Joining a Team Project.
Add the project to source control and thereby create a local workspace in which to store, edit, and test your source-controlled files.
Create a Visual Studio solution and then perform a source control check-in on it. For more information, see Adding Projects and Solutions to Source Control from Solution Explorer.
Conduct the steps in Walkthrough: Exploring Team Foundation Source Control.
You must have the following security permissions to complete this walkthrough:
- PendChange
- Checkin
For more information about Team Foundation source control security permissions, see Overview of Team Foundation Security.

Required Permissions

To complete this walkthrough, you must have the PendChange and Checkin permissions. For more information, see Source Control Security Rights and Permissions.

Branching Source Control Items

The following procedure, describes how to perform a branch operation. Branching is a Team Foundation source control function to create new folders or files based on existing ones. For more information, see Understanding Branching and How to: Branch Files and Folders.

Warning

The following procedures assume that you have already completed the steps in Walkthrough: Exploring Team Foundation Source Control.

To branch items in source control

On the View menu, select Source Control Explorer to open it.
In Source Control Explorer, from the View menu, choose Other Windows, and then choose Source Control Explorer if not already open.
In Source Control Explorer, navigate to the MyWindowsApp folder containing the MyWindowsApp.sln solution file you created in Walkthrough: Exploring Team Foundation Source Control, right-click, and choose Branch.
In the Branch dialog box, in the Target text box, modify the location and name for the new branch by appending the end with Test Branch. You may also click Browse to navigate to a location.

Note

Target branches are automatically appended with the string "-branch."
In the Branch from version section, in the By drop-down list box, choose Latest Version.
Click OK, the new branch is created and presented in Source Control Explorer.
Click the new branch folder called MyWindowsApp Test Branch. Notice that under the Pending Change column, each item in the new branch has a status of branch.
Since a branch is a pending change, you must perform a check-in to apply the branch. Right-click the MyWindowsApp Test Branch folder and choose Check In Pending Changes.
In the Check In dialog box, in the comment text box, type Test branch and click Check In.

Note

If your team project has check-in policies in effect, you may need to associate work items or check-in notes prior to continuing. For more information, see How to: Associate Work Items with Changesets and How to: Associate Check-in Notes with Changesets.
The Pending Change column in Source Control Explorer displays blank entries indicating that your new branch is checked in.

You have now successfully created a new branch and checked it in; the next procedure will have you make changes to files in both the original and new branches.

Apply Some Changes to the Branches

Once you have completed the steps in the previous branching procedure above, you need to make some changes to a file on both branches so you can conduct a merge on the two branches and resolve the resulting merge conflicts. The following procedure steps you through checking out and editing files in both branches.

Check out and edit some files in the source control branches

In the new branch created in the preceding step, expand MyWindowsApp Test Branch folder and in the right pane, locate the Class1.cs file you created in Walkthrough: Exploring Team Foundation Source Control, right-click, and choose Check Out For Edit.
In the Check Out dialog box, click Check Out, you are returned to the Source Control Explorer with the file's Pending Change status changed to edit.
Double-click the Class1.cs file to open it for editing.

In the Class1.cs file, add the "New branch" string:

using System;
using System.Collections.Generic;
using System.Text;

namespace MyWindowsApp
{
      class Class1
      {
            string SourceControlMerge = "New branch";
      }
}

In Source Control Explorer, right-click the Class1.cs file, and choose Check In Pending Changes.
In the Check In dialog box, in the comment text box, type New branch changes and click Check In.

Note

If your team project has check-in policies in affect, you may need to associate work items or check-in notes prior to continuing. For more information, see How to: Associate Work Items with Changesets and How to: Associate Check-in Notes with Changesets.
The Pending Change column in Source Control Explorer displays a blank entry for the Class1.cs file indicating that your edits have been checked in.
Now, you need to make changes to the original branch. The steps are much the same as you just completed. In Source Control Explorer, navigate to the folder containing the original branch called MyWindowsApp.
In the original branch, expand MyWindowsApp folder and in the right pane, locate the Class1.cs file you created in Walkthrough: Exploring Team Foundation Source Control, right-click, and choose Check Out For Edit.
In the Check Out dialog box, click Check Out, you are returned to Source Control Explorer with the file's Pending Change status changed to edit.
Double-click the Class1.cs file to open it for editing.

In the Class1.cs file, add the "Original branch" string:

using System;
using System.Collections.Generic;
using System.Text;

namespace MyWindowsApp
{
      class Class1
      {
            string SourceControlMerge = "Original branch";
      }
}

In Source Control Explorer, right-click the Class1.cs file and choose Check In Pending Changes.
In the Check In dialog box, in the comment text box, type Original branch changes and click Check In.

Note

If your team project has check-in policies in affect, you may need to associate work items or check-in notes prior to continuing. For more information, see How to: Associate Work Items with Changesets and How to: Associate Check-in Notes with Changesets.
The Pending Change column in Source Control Explorer displays a blank entry for the Class1.cs file indicating that your edits have been checked in.

Now that you have successfully created a branch and affected changes to both the original and new branches, the next procedure steps you through merging the changes from both branches.

Merging Source Control Items

After you have made changes to files in the branches, you can conduct a merge. The following procedure demonstrates merging with Source Control Explorer. For more information, see Understanding Merging and How to: Merge Files and Folders.

To merge branches in source control

In Source Control Explorer, right-click MyWindowsApp Test Branch folder and choose Merge.
In the Version Control Merge Wizard, in the Source Branch text box, the path and name for the MyWindows App Test Branch folder appears.
In the Target Branch drop-down list box, select the MyWindowsApp folder.
In Select the source branch changes you would like to merge, select All changes up to a specific version, and click Next.
In the Select the version of the source items step, in the Version Type drop-down list box, choose Latest Version, and click Next.
In the Perform the merge operation step, click Finish.

Since there are differences between the source and target branches, the Resolve Conflicts dialog box appears; to continue resolving the conflicts, use the steps in the following procedure. If no conflicts are present when you perform a merge, the Resolve Version Conflict does not appear.

Resolving Merge Conflicts

Since there are differences among files in both branches, you are prompted to take action to resolve conflicts between the two branches. For more information, see How to: Resolve Conflicts. To resolve the merge conflicts, conduct the steps in the following procedure.

To resolve merge conflicts

In the Resolve Conflicts dialog, click Resolve, the Resolve Version Conflict dialog box appears.
In Resolve Version Conflict dialog box, in Resolution Options, choose Merge changes in merge tool, and click OK.
In the merge tool, locate the conflict in the two files by clicking Next Change, the files are presented side-by-side showing the two strings (Original branch and New branch) you entered in the earlier procedure.
Click the code containing the string New branch, the change is placed in the bottom pane.
Click OK.
In Microsoft Visual Studio dialog box, choose Yes to save the file.
In the Accept Merged Result dialog box, click Yes to keep the merged file.
In the Resolve Conflicts dialog box, click Close.
In Source Control Explorer, right-click the MyWindowsApp folder, and choose Check In Pending Changes, the Check In dialog box appears.
In the Check In dialog, click Check In.

Note

If your team project has check-in policies in effect, you may need to associate work items or check-in notes prior to continuing. For more information, see How to: Associate Work Items with Changesets and How to: Associate Check-in Notes with Changesets.

You have now successfully created a branch, made changes to both the original and new branches, merged the two together, and resolved resulting conflicts. The next procedure demonstrates how to use labels in Team Foundation source control.

Labeling Source Control Items

In Team Foundation source control, a label is a name applied to a specific set of revisions, often referred to as a snapshot build. Labels can only apply to one revision of a file. With a subsequent revision of a file, the label must either be removed, or a new label must be applied. Labels are a simple way to organize a set of files in a revision. For more information, see Working with Labels and How to: Apply Labels.

To apply labels to source control

In Source Control Explorer, navigate to the MyWindowsApp Test Branch folder created in the earlier procedure, right-click, and choose Apply Label.
In the Apply Label dialog box, in the Name text box, type MyWindowsApp label test.
In the Comment text box, type Testing walkthrough.
Under Items, click Add.
In the Choose Item Version dialog box, make sure that the Look in list box contains the team project you are working on.
Navigate in the MyWindowsApp Test Branch folder to locate the Class1.cs file and select it.
In the list box, choose Latest Version.
Click OK, the Apply Label dialog box displays with the items populated.
Click OK.

Share via