Move, copy, delete, or revert files, Resolve conflicting files, Go offline – Adobe Dreamweaver CC 2015 User Manual

Page 127: Clean up a local svn site

Advertising
background image

120

File management

Last updated 6/3/2015

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.

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.

Advertising
This manual is related to the following products: