Chapter 5
Microsoft Visual Studio 2005

This screen illustrations in this chapter shows Visual C++, but the same dialogs are displayed regardless of which Visual Studio IDE you use.

When you configure Visual Studio 2005 with the Perforce SCC Plug-in, the settings are specific to the project you are working on, so no overall Perforce configuration is required for Visual Studio.

Basic SCM tasks

• "Adding a project to the depot" on page 44.

• "Checking files out" on page 45

• "Retrieving files from the depot" on page 46

• "Checking files in" on page 47

• "Resolving file conflicts" on page 47

• "Diffing files" on page 48

• "Reverting files" on page 49

• "Miscellaneous tasks" on page 49

Adding a project to the depot

To add a Visual Studio 2005 project to your depot, perform the following steps:

1. In the Solution Explorer, right-click the project and choose Source Control>Add Solution to Source Control. The Open Connection dialog is displayed, as shown in the following figure.

2. On the Open Connection dialog, enter the required settings as follows:
   • Server: the name of the host computer running the Perforce server in which you want to store the project.

   • Port: the port number on which the specified Perforce Server accepts commands.

   • User: the Perforce user name you want associated with the SCM operations you perform on the project. To choose from a list of users defined for the specified server, click Browse.

   • Password: the user's password, if any.

   • Workspace: the Perforce workspace associated with the SCM operations you perform on the project. You must save the project in a folder under the workspace root. To choose from a list of workspaces defined for the specified server, click Browse...

3. Click OK to dismiss the dialog. P4SCC puts the files into a Perforce changelist, ready to add to the depot, as indicated by a red check mark displayed in the Solution Explorer.

4. In the Solution Explorer, right-click the solution and choose Check In Now. The Submit Changelist dialog, listing files, is displayed.

5. Enter a description in the description field and click Submit. Your files are added to the depot. (Using Perforce, you can verify that the default changelist has been submitted and the files are now in the depot.)

Checking files out

To check out files:

In the Solution Explorer pane, right-click the desired file (or the project, if you want to check out all its files) and choose Check Out for Edit Now. In the Solution Explorer pane, files are displayed with a check mark, as shown in the following figure.

The checked-out files are listed in the Pending Checkins pane.

If you branch a project using Perforce, the Visual Studio bindings must be corrected to correspond to the project's new location. To correct bindings for a branched solution, you must perform the following steps the first time you check out the branched project.

To check out a newly-branched project (first time only):

1. Choose File> Source Control > Open from Source Control.... The Open Connection dialog is displayed.

2. Specify connection settings for the server that contains the project you want to check out and click OK. The Open Project dialog is displayed.

3. Browse to the branched project you want to open and double-click its .sln file.

4. If the newly-branched files are present in your workspace, Visual Studio displays the following dialog:

5. Click Overwrite. Visual Studio displays the Open Solution dialog.

6. Double-click the .sln file. Visual Studio displays the following dialog.

7. Click OK.

Retrieving files from the depot

To retrieve revisions prior to the head (latest) revision, perform the following steps:

1. In the Solution Explorer pane, click the file.

2. Choose File > Source Control > View History. The History dialog is displayed, listing the revisions in the depot.

3. Right-click the desired revision and choose Get Revision.

   Note	If you retrieve a file that you already have checked out, for example, to obtain changes checked in by another user, Perforce requires you to resolve the file, to ensure that you don't inadvertently overwrite other users' changes.

1. Choose File > Source Control > Open from Source Control... The Open Connection dialog is displayed.

2. Enter the settings that specify the server where the project is stored and the client workspace and user with which you want to check the project files out, and click OK. The Perforce Open Project dialog is displayed.

3. Browse to the .sln file for the project you want to sync and click OK. The project files are synced to your workspace.

Checking files in

To check in files, perform the following steps:

1. In the Solution Explorer pane, right-click the file and choose Check In Now. The Submit Changelist dialog is displayed.

2. Enter a description of your changes and click Submit.

To view all your pending changelists, click the Manage Changelists button on the Submit Changelist form. P4SCC displays a dialog listing your pending changelists. In this dialog, you can move files among changelists by dragging and dropping them.

Resolving file conflicts

To resolve file conflicts:

1. Right-click the file that has conflicts and choose Get Latest Revision.

   The file is now scheduled for resolve, indicated by the message "Resolve this file before submitting."

2. Right-click the file and choose Resolve Files... The Resolve dialog is displayed, describing the differences between the file revisions and listing the following options:
   • Accept Merge: merge both files and accept the result, including both the changes you made and the changes made by other users.
   • Accept Yours: check your changes in, overwriting the most recently checked-in version.
   • Accept Theirs: discard your changes and preserve the other user's changes.
   • Run Merge Tool: launch the merge utility so you can view the differences between your version and the most recently checked-in version. Using the merge utility, you can select individual passages or enter new changes to create the final version that you check in.
   • Other choices: you can view either file (Open File...), diff your file with the conflicting file, display the file's revision history either textually or graphically.
3. Click the desired resolve option. (If you choose to merge, the merge utility is displayed. Merge and exit, saving your changes.) The Submit Changelist dialog is redisplayed.

4. Enter a description of your changes and click Submit. Your changes are checked in.

Diffing files

To diff two revisions of a file, perform the following steps:

1. In the Solution Explorer pane, right-click the file and choose File > View History. The History dialog is displayed, listing the revisions in the depot.

2. To diff two revisions, drag one revision to the other. The diff utility is launched, displaying file differences.

Reverting files

1. In the Solution Explorer pane, right-click the file and choose Undo Check Out... The Undo Check Out dialog is displayed, listing the files to be reverted.

2. Check the files you want to revert and click Undo Checkout.

You can also revert unchanged files from the Pending Changelist dialog.

Which files do I put in the depot?

Miscellaneous tasks