Adobe Dreamweaver CC 2014 v.13 User Manual

Page 410

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.

Go offline

You might find it useful to avoid repository access during other file-transfer activities by going off-line. Dreamweaver will reconnect to the SVN
repository as soon as you invoke an activity that requires a connection (Get Latest Versions, Commit, and so on).

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) any file or folder in the Files panel and select Version Control > Go Offline.

Clean up a local SVN site

This command lets you remove locks on files so that you can resume unfinished operations. You should use this command to remove old locks if
you receive “working copy locked” errors.

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 clean up and select Version Control > Clean Up.

About moving files and folders in Subversion-controlled sites

When you move the local versions of files or folders in a Subversion-controlled site, you run the risk of creating problems for other users who
might be synching to the SVN repository. For example, if you move a file locally, and don't commit that file to the repository for a few hours,
another user might try to get the latest version of the file from the file’s old location. For this reason, you should always commit files back to the
SVN server immediately after you've moved them locally.

Files and folders remain on the SVN server until you've manually deleted them. So even if you move a file to a different local folder and commit it,
the old version of the file remains in the previous location on the server. To avoid confusion, delete the old copies of files and folders that you've
moved.

When you move a file locally and commit it back to the SVN server, the file’s version history is lost.