Working with SVN

Purpose

Adding Files to Existing Projects

Adding an SVN Repository

Making Changes, Comparing Changes and Committing Changes

Sharing Projects

Replacing Files with Older Versions

Checking Out Projects from SVN

Deleting Files from SVN

To add a new SVN repository:

1. Open the SVN perspective by going to Window | Open Perspective | Other | SVN Repository Exploring.

2. In the SVN Repositories view, click the Add SVN Repository button on the view's toolbar -or- right-click within the SVN view and select New | Repository Location.
   The Add SVN Repository dialog will open.

3. Enter the information required to identify and connect to the repository location:

• URL - The URL on which your repository is located.

• Authentication - The user name and password you use to connect to SVN.

4. Click Finish.
   Your SVN repository will now be added to the SVN Repository view.

The following steps demonstrate how to upload a project to your SVN repository location:

1. Create a new PHP project called "MySVN Project".

2. Within the project, create a PHP file called "SVNFile1" with the following code:

<?php

//This is a new file

?>

3. In PHP Explorer View, right-click your project and select Team | Share Project.
   A Share Project dialog will open.

4. From the repository list, select SVN and click Next.

5. Select 'Use existing repository location', and select your repository from the list.

6. Click Finish.

7. Depending on your authentication settings, a dialog might appear asking you to provide authentication information.
   Re-enter your password and click Next. (Mark the Save Password checkbox to ensure that this screen does not reappear.)

8. A Commit dialog will open. Enter the comment "I am uploading files to SVN." and click OK.

9. In PHP Explorer View, your project will now have a repository icon , indicating that it is in SVN.

10. Once you have committed your files, other team members will be able to access and change the files.

The following steps demonstrate how to check out (import) projects from SVN into your workspace:

1. Delete the 'MySVN' project from from your workspace in order to simulate being a new user who has not previously had access to this file.
   Note: Deleting the project from your workspace will not delete it from SVN.

2. Go to File Menu and select Import | Projects from SVN.

3. Click Next.

4. Select your repository.

5. Click Next.

6. A 'Select Resource' dialog will appear. Expand the nodes until you see your project (by default, this will have been placed under 'Trunk').

7. Select your project and click Finish.
   A 'Check Out As' dialog will appear.

8. Leave the 'Check out as a project with the name specified' option marked and click Finish.

The project will now be imported into your workspace.
Note that the project will have an SVN repository icon in your PHP explorer view.

The following steps demonstrate how to add and commit a file into an existing project:

1. In your SVNProject, create a new PHP file, called "SVNFile2" with the following code:

<?php

//Another new file

?>

2. Save the file.

3. In PHP Explorer View, select the file, right-click and select Team | Commit.

4. A Commit dialog will open.
   Enter a comment "Another new file added." and click OK.

The file will be committed to SVN and will be accessible by other users.

The following procedure demonstrates how to make changes to files and comparing local files to files in the repository:

1. Open SVNFile1 in your SVNProject.

2. After the text "This is a new file.", add "I have made a change".

3. Save the file.
   In PHP Explorer view, the file and project will have a ">" suffix, indicating that a change has been made which has not yet been committed.

4. So far, the changes have only been saved in your workspace. In order to compare the local file to which you have made changes with the one sitting in the SVN repository, right-click the file in the PHP Explorer view and select Team | Synchronize with Repository.

5. Click Yes when asked whether to open the Team Synchronizing perspective. (Check the 'Remember my decision' box to prevent this prompt from appearing in the future.)

A Text Compare dialog will open showing the local file you have just made changes to (in the left-hand window) as compared to the file in the repository (in the right-hand window).
The change you have made will be highlighted.

In addition, the Synchronize view will have opened in the left hand-side, displaying the file to which you have made changes. The file will have a grey arrow icon indicating that changes have been made which need to be synchronized with the repository.

To commit your changes to the repository:

1. From the Synchronize view, click the 'Commit All Outgoing Changes' button.
   -Or- In PHP Explorer View, right-click your file and select Team | Commit.

2. A Commit dialog will open.
   Enter the comment "I have made changes to SVNFile." and click Finish.

Your changes will now be committed to SVN and all users will be able to access the file.

This procedure demonstrates how to replace your file with an older version:

1. In the PHP Explorer view, select your SVNFile1 and from the right-click menu select Replace with | Revision.
   A Replace with Revision dialog will open.

2. Select Revision and click Select.
   A Select Revision dialog will open, listing the various times the file has been committed (revisions).
   As committed changes have been made twice (once during the original upload and once when you edited the file), 2 revisions should be listed with their relevant comments.

3. Scroll between the two revisions.
   To return the file to it's previous state, select the second revision in the list (containing the comment "I am uploading files to SVN.") This is the original state the file was in when it was first uploaded.

4. Click OK.
   You will be returned to the Replace with Revision dialog, which will now have a revision number in the Revision box.

5. Click OK.
   You will be prompted to confirm that you would like to replace the revision.

6. Click Yes.

Your project will be reverted to the old one and the line "I have made a change" will be removed from SVNFile1.

This procedure demonstrates how to delete a file from SVN:

1. Open the SVN Repositories view.

2. Expand the nodes to find your project.

3. Right-click the file you would like to delete and select Delete.
   A "Commit Deletion" dialog will open.

4. Enter a comment if required.

5. Click OK.

The file/project will be deleted from your SVN repository.

Related Links:

Quick Start

SVN

Using SVN

Configuring an SVN Connection

Uploading Projects to SVN

Importing Projects From SVN