Operation Manual

89
USING DREAMWEAVER
Creating and Managing Files
Last updated 3/28/2012
2 Do one of the following:
Display the SVN repository files by selecting Repository View from the View pop-up menu in the Files panel,
or by clicking the Repository Files button in the expanded Files panel. Then right-click (Windows) or Control-
click (Macintosh) the file you’re interested in and select Lock or Unlock.
Display the local version of your SVN files in the Files panel by selecting Local view from the View pop-up menu.
(If you are working in the expanded Files panel, the Local view is automatically displayed.) Then right-click
(Windows) or Control-click (Macintosh) the file you’re interested in and select Lock or Unlock.
Add a new file to the repository
A blue plus sign on a file in the Files panel denotes a file that does not yet exist in the SVN repository.
1 Make sure that you’ve successfully set up an SVN connection.
2 In the Files panel, select the file you want to add to the repository and click the Check In button.
3 Make sure that the file is selected for Commit in the Commit dialog box and click OK.
Move, copy, delete, or revert files
To move a file, drag the file to the destination folder in your local site.
When you move a file, Dreamweaver marks the file in the new location with an Add With History sign, and marks
the file in the old location with a Delete sign. When you Commit these files, the file in the old location disappears.
To copy a file, select the file, copy it (Edit > Copy), and paste (Edit > Paste) the file in the new location.
When you copy and paste a file, Dreamweaver marks the file in the new location with an Add With History sign.
To delete a file, select the file and press delete.
Dreamweaver gives you the option of whether you want to delete the local version of the file only, or both the local
version and the version on the SVN server. If you select to delete the local version only, the file on the SVN server
is not affected. If you select to delete the version on the SVN server as well, the local version is marked with a Delete
sign, and you must commit the file for the deletion to take place.
To revert a copied or moved file to its original location, right-click the file and select Version Control > Revert.
Resolve conflicting files
If your file conflicts with another file on the server, you can edit it and then mark it as resolved. For example, if you try
to check in a file that conflicts with another user’s changes, SVN will not let you commit the file. You can get the latest
version of the file from the repository, manually make changes to your working copy, and then mark your file as
resolved so that you can commit it.
1 Make sure that you’ve successfully set up an SVN connection.
2 Display the local version of your SVN files in the Files panel by selecting Local view from the View pop-up menu.
(If you are working in the expanded Files panel, the Local view is automatically displayed.)
3 Right-click (Windows) or Control-click (Macintosh) the file you want to resolve and select Version Control > Mark
as Resolved.