These two days in Dreamweaver practice JavaScript, create a site, accidentally found in the right key document, suddenly see version control. It's a surprise.
Temporarily put down the study of JS, spent some time, a good study of the relationship between the 2. Here are the results of "research":
Dreamweaver started with the CS4, and the SVN operation Tool was built in. Provides versioning capabilities for site management. It can connect to a server that uses Subversion (SVN), a version control system that enables users to collaborate on editing and managing files on a remote WEB server. Dreamweaver is not a complete SVN client, but it allows users to get the latest version of the file, change, and submit files. Let's take a test here.
Set up SVN connection
Before using Subversion (SVN) as a Dreamweaver version control system, you must establish a connection to the SVN server. The connection to the SVN server is established in the version control category of the Site Definition dialog box, so you should first establish a site.
I'm using Dreamware CS5, and the steps are much simpler:
Select Site > New site, fill in "Site name", select "Local site Folder", click "Save" to complete simple site creation.
Before you start this setting, you must create libraries and users on SVN server, and set access permissions on SVN servers and the SVN repository (VISUALSVN server is required). The steps are not much to say, look at the picture:
Now the authority is ready. You can establish a connection to Dreamweaver with SVN.
In fact you are very careful, you will find in the creation of the site, in the left-hand column of the third option, there is a "version control." Yes, that's where the connection is set up. But for the site we're building now, we can do the following steps to build the SVN connection:
Select Site > Manage sites, select the site for which you want to set version control, I choose JavaScript here, and then click the Edit button.
The Site Settings dialog box pops up. This form is not very familiar with it. On the left side of the Site Settings dialog box, select the version control category.
From the Access pop-up menu, select Subversion.
Follow these steps to set access options:
Select the protocol from the Protocol pop-up menu. Optional protocols include HTTP, HTTPS, SVN, and Svn+ssh. Select "HTTPS" here.
In the Server Address text box, enter the address of the SVN server. The usual form is: server name. domain. com, or with IP. I'm using the ip:192.168.24.155 in the LAN.
In the Repository Path text box, enter the path to the repository on the SVN server. Typically similar to:/svn/your_root_directory, meaning the root path of the svn+ library. I'm using a/svn/javascript here.
Optionally, if you want to use a different server port than the default server port, select Non-default and enter the port number in the text box. Generally use the default can be.
Enter the user name and password for the SVN server.
Click Test to test the connection, and if successful, you will be prompted for "server and Project Access." Click OK to close the dialog box and click "Save" to save the current settings. Then click Finish to close the Manage Sites dialog box.
After you have established a connection to the server, you can view the SVN repository in the Files panel. To view the SVN repository, you can click the Repository Files button in the expanded Files panel.
Submitting files
Create or add a Web page in the local site (after adding, the name will have a "+" number before it), and then select the page and right-click the "Version control" > "Submit". Enter "prompt message" and click "Submit".
Switch to Repository view to view files that have just been uploaded in the library:
deleting files
At the local site, select the page, right-click "Edit" > "delete", or press the DELETE key, which will let you choose to remove from version control or locally. The difference between the two types of deletion is also given in the interface. To demonstrate other features, we choose "Delete locally" (that is, save in the library).
Get the latest version of the file
When you get the latest version of a file from the SVN repository, Dreamweaver merges the contents of the file with the contents of its corresponding local copy. (That is, if you have another user update the file after you last submitted the file, the updates will be merged into the local version file on your computer.) If the file does not exist on the local hard drive, Dreamweaver will get the file directly.
Directly on the site, right-click the "Version control" > "Get the latest version" to complete.
Show revisions
Right-click the file you want to view, select Version control > show Revisions ... to view the history of the revisions. Select a record from the current version and click "Promote to Current version" for version conversion.
Lock and Unlock files
By locking the files in the SVN repository, you can let other users know that you are working on the file. Other users can still edit the file locally, but you must wait until you unlock the file before you can submit it. This feature is intended primarily to prevent multiple users from modifying the same file at the same time, which can lead to conflicting issues. When you lock a file in the repository, a unlock icon appears on the file. Other users will see the fully locked icon.
Unlocking is a similar operation and no more demo.
Resolution of conflicting files
If your file conflicts with other files on the server, you can edit your file and mark it as resolved. For example, if you try to save a file that conflicts with another user's changes, SVN will not allow you to submit the file. At this point, you can get the latest version of the file from the repository, manually change the working copy, and then mark your file as resolved so that you can submit it.
Right-click the file you want to resolve, and then choose Version Control > Mark as resolved.
In fact, the function of Dreamweaver is still very powerful, there are some other functions, it is no longer introduced, interested in you can go to explore.