[SCM] source code management-tortoisesvn

Tortoisesvn is easy to install and used in the form of a Windows Shell.

 

One icon

Tortoisesvn reloads the file and folder icons to better display the version control status. As follows:

 

: A New detected work copy is reloaded with a green check mark. Indicates the Subversion status.Normal.

: After you start editing a file, the status changesModifiedThe icon reload turns into a red exclamation point. In this way, you can easily see which files have been modified since you last updated the work copy and need to be submitted.

: If an error occurs during the update processConflictThe icon will become a yellow exclamation point.

: If you set a fileSVN: Needs-LockAttribute, subversion will make this file read-only until you get the file lock. Files with this overload icon indicate that you must get the lock before editing.

: If you have a file lock and the subversion status isNormalThis overload icon reminds you to release the lock if you do not use the file and allow others to submit modifications to the file.

: This icon indicates that some files or folders in the current folder are under version control.DeleteOr a version-controlled file in the folder is lost.

: The plus sign indicates that a file or directory already exists.JoinVersion control.

: This icon indicates that the file or folder will not be changed by SVN for version control, will be ignored, will not appear in the commit dialog box, will not be commit to server.

: This icon indicates that the file or folder has not been established with SVN version control, nor is it in the ignored list.

 

2. Right-click menu (right-click a file or folder under SVN Control)

 

SVN update: use the latest version of SVN server repository to work with the new local copy.

SVN commit: submits modifications to local copies to SVN server repository.

Tortoisesvn-> show log: displays the modification history of a file or folder.

Tortoisesvn-> repo-Browser: browse SVN server repository or some folders.

Tortoisesvn-> check for modifications: Check the modifications of the local copy relative to the svn server.

Tortoisesvn-> reversion graph: view the version graph of a file or folder.

Tortoisesvn-> edit confilit: After you modify the local copy, you need to call and update the latest version of SVN server repository before submitting (COMMIT, otherwise, it cannot be submitted (COMMIT ). At this time, if the file you modified has been updated by someone else on the server, after the update, the file of the local copy you modified will be in the conflit state, in this case, you need to call edit confilt to perform merge operations to obtain the merged file.

Tortoisesvn-> resolved: after calling edit conflict, you have completed merge's work, but you have to submit (COMMIT) Merge results, you also need to call resolved to let SVN know that the file conflict has been resolved. You can submit the file.

Tortoisesvn-> Update to version: Use a new local copy to the specified SVN server repository version.

Tortoisesvn-> rename: to modify the name of a file or folder, delete the original file and create a new one. A commit is required to be reflected on the svn server.

Tortoisesvn-> Delete: indicates that a file or folder is deleted and must be commit to be reflected on the svn server.

Tortoisesvn-> revert: Cancel modification to the local copy before commit.

Tortoisesvn-> Clean Up: A Subversion command may fail to be completed due to server issues, and your work copy is stuck in an inconsistent state. In that case, you need to use cleanup on this directory.

Tortoisesvn-> get lock: Use get lock to lock files so that others cannot change the lock.

Tortoisesvn-> release lock: Release the lock on the file.

Tortoisesvn-> branth/Tag: the branch and tag processes are the same. They are all new copies of folder on the svn server. Brach is generally used for feature development under the braches directory. The tag is in the tags directory and used to mark a specific version.

Tortoisesvn-> swith: used to set the URL location of the svn server to which your local copy is targeted. Switch the branch, truck, or tag you are targeting. For example, when you start with truck and are about to release, you need to transfer it to the newly created Brach. In this case, you need to use swith to switch to Brach.

Tortoisesvn-> merge: Used for the merge between Brach.

Tortoisesvn-> export: From the svn server, reporitory or files are everywhere to the local device, excluding version information.

Tortoisesvn-> relocate: If the repository URL changes, use relocate. For example, SVN Server IP address, protocol, or repository root change. If you only switch between different braches or tags in the same repository, use swith.

Tortoisesvn-> Add: Mark a file or folder as ADD. After commit, this file or folder is added to SVN server repository.

Tortoisesvn-> Create Patch: Create patch is used to package your modifications to the local copy, and then the patch can be used by other developers for review. In this way, your modifications are shared with others before they are submitted to the svn server.

Tortoisesvn-> applay Patch: Perform merge on patches created by others and local copies to view others' modifications.

3. Right-click menu (the svn control menu has not been added)

 

SVN checkout: obtain a working copy from SVN server repository to the local device.

Tortoisesvn-> Create repository here: create a local SVN repository. Right-click an empty local folder. The created repository can be accessed through file: // D:/mytestproject2 by tortoisesvn, or shared by tortoisesvn on other machines.File: // servername/mytestproject2.In this way, you do not need to install other SVN servers, and HTTP access is not supported. It is generally used to manage the version of local files or share files in a group.

Tortoisesvn-> Import: Import local projects, files, or folders to SVN server repository. Before import, delete all files not required by the build project (temporary files, files generated by the compiler, such as *. OBJ, binary files generated ,...).

Tortoisesvn-> Add to ignore list: add files or folders to the ignore list. The files or folders contained in the ignore list are ignored by commit.

 

4. Right-click and drag the menu

 

 

Tortoisesvn-> merge

There are three situations: [All merge results are reflected in local work copies. To reflect the results to SVN server repository, you must submit a commit to the local copy after merge, at the same time, before merge, make sure that the server URL for your copy is set as the URL you want to submit. You can use swith to view and switch]

1)(Merging a range of revisions)A local copy of a version or version on a Brach or tag in merge.

2 )(Reintegrate a branch) A local working copy of the latest version on a Brach or tag of merge.

3 )(Merging Two different trees) MergeSome versions or the latest version of a Brach or tag are working on a local copy.

 

Generally, to complete the integrate between Brach, You need to first perform merge, and then submit the result merge to the local copy.

Instance:

1) integration from Brach to trunk

1. Make sure that any of your modifications are submitted;

2. Make sure that the current job is on the trunk. You can use swith to view and switch to the trunk;

3. Follow the new local trunk copy to the latest;

4. In the root directory tortoisesvn-> merge, select reintegrate a Brach;

5. Write the full path of the Brach to be integrated to the from URL in dialog box 2 of Merge Wizard;

6. In the Merge Wizard Dialog Box 3, select fully recursive for merge depeth.

7. In dialog box 4 of Merge Wizard, edit conflict and Mark resolved conflict files.

8. Submit the locally integrated result;

 

2) integration from trunk to Brach is the same as the integration process from Brach to truck. The only thing you need to note is to use a switch to ensure that you are currently working on Brach, then, write the full path of the trunk in the from URL.

6. Use tortoisesvn-> Create repository here to create a local SVN Repository

By using this method, you can manage the version of a local folder. If the folder is shared, anyone who can access the folder can checkout and commit. To create a ticket in this way, you only need to install tortoisesvn and call create repository here. You do not need to install SVN server. Because SVN server is not installed, HTTP or HTTPS access is not supported, it can only be accessed through file.

1) create a folder, for example, C: \ mysvnrepository;

2) Right-click the new empty folder and call tortoisesvn-> Create repository here to create the local repository;

3) You can use tortoisesvn-> Import to import files to this repository for version management;

4) You can use tortoisesvn-> checkout and commit to modify files;

5) You can use tortoisesvn-> ropo browser to locally view the repository, as shown below:

 

6) If shared, other machines can use tortoisesvn-> ropo browser to view the repository, as shown below:

 

7. Download

Http://www.collab.net/downloads/subversion/

 

8. Reference

Http://svndoc.iusesvn.com/

Http://thinkinging.com/2007/04/12/creating-a-local-subversion-repository-with-tortoisesvn/

Http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-repository.html#tsvn-repository-create

 

Complete!