SVN creates and merges branches in Eclipse-graphical interface

The General SVN code Library directory structure is:

• Branches (branch)
• tags (tags)
• Trunk (development Backbone)

Create a branch from the trunk

1. Right-click Trunk->tortoisesvn->branchtag
   To path you create the path of the Branch/tag. Create copy in the Repository from: (Generate copy from warehouse)
   HEAD revision in the repository (created from the latest revision, usually with this)
   Specific revision in repository (Specify revision creation)
   Working copy
   2. Click ok-> to update svn

Branch Merge

• Right-Trunk->merge Select merge Type and fill in the merge range
  
  Merge Type
  1.Merge a range of revisions
  The main focus is to merge the changes in the branch into the trunk.
  Click Next
  
  URL to merge from select Branch to merge
  Revision Range to merge

  • All revisions from creation to last commit, all modified content
  • Specific range Specifies the merge range, merging the specified revision range to the main branch
    
    • Use the Log dialog box to select the revisions you want to merge, or enter the revisions that you want to merge, separated by commas. The revision range can be specified with dashes.

  2.Merge different trees (this number good trouble, later study again)
  You can select a trunk version of the past to merge with a version of the branch. Based on the branch version, if the trunk version differs from the branch version, the different parts of the trunk will be discarded when merging
  (1) Merging the changes of the trunk to the branch
  Branches, right-->merge->merge, different trees
  From the Select branch from the path and select from which revision to start preserving branch modifications,
  To select the trunk path and choose from which revision to start merging the skeleton changes into the branch

When the merge Type is selected, fill in the Merge branch URL and merge revisions (merge scope) Next (using default settings)->merge.

Version management:

1. Tag put on the line or the test APK submitted when the message written on the corresponding trunk of the revision, such as a bug on the line, need to be modified immediately, the trunk of the code is being developed (I have encountered this), you can download the code through revision, Modify a bug to resubmit the online package
2. The best thing to do is to develop a new version on the branch, and then merge it into the trunk after the new version is stable, so you can refer to multiple versions of parallel: http://blog.csdn.net/mycwq/article/details/51793847

SVN creates and merges branches in Eclipse-graphical interface