First, why do we need to use the branch-merge. For example, there are two teams under Project demo, and SVN has a trunk version. Because of the sudden change in customer demand, resulting in the project needs to make a large change, at this time the team decided by the Group 1 to continue to complete the work of the original half of the "one module", the group 2 to develop new requirements. So at this point, we can set up a branch for group 2, the branch is actually a trunk version of "trunk" a copy version, but the branch is also a version control function, and is independent of the main line, of course, to the end we can through the "merging" function, the branch into the trunk, And eventually merge into one project.
Below is the detailed use of the Subeclipse plugin under eclipse:
First, build a project called Facebook.
1. Create a branch, and specify access to the new branch url:facebook3[note do not forget]
2. After establishing a good score, use the "toggle" function to switch to the branch for development.
I created a new fb3.html file and submitted it under the branch.
3. Switch back to trunk version "that is the URL for Facebook version"
You will find that the trunk version does not appear in the fb3.html we just submitted, because fb3.html belongs to the branch, the next thing we want to do is "merge", by merging, we can merge the changes under the branch into the trunk version.
Here is the main configuration of the merge:
Start path: Trunk version of the path "if you need to merge the trunk version of the changes to the branch is the opposite"
Destination path: Where to get the change "This is the branch path"
You can use the specified version number, where the latest revision is used.
4. Click Merge and you will find a new file under the trunk version fb3.html
This allows us to merge the changes made under the branch into the trunk version.
It is worth noting that:
1. It's a good idea to add comments when creating a branch.
2. It is a good idea to ensure that two versions are clean before merging, "that is, there are no uncommitted or conflicting files."
3. Target path when merging: The URL whose changes need to be merged into other versions.
The SVN command line output for the entire process is as follows:
I hope this article will be of some help.
Other references:
Http://www.iteye.com/wiki/subclipse/1626-subclipse-getting-started-guide-and-reference-c
=========================== about merging ==========================
When I merged, I found that the merged file was directly overwritten without the "conflict" that was supposed to occur, and later, after careful study, it was an operational problem.
Suppose my original project was placii, and the establishment of a branch was placiistore. Now you need to merge the branch Placiistore onto the main trunk. That configuration should
1. "Start path": The path of the branch is required here.
2. First revision number: The version number when the branch is established. Record the SVN console when you set up the branch
Mine is.
3. Destination path: Use the start path here.
4. Target version number: Use the latest version that is HEAD.
Click Merge and if someone makes a change on the main line version and you change the file on the branch, there will be a conflict. Then manually merge the conflicting code and right-mark it for resolution, which is what we have to do.
Trunk: Skeleton directory, files in this directory are base files
Branches: Branch Directory for development
Tags: The version directory for publishing
is a directory structure that is viewed based on the Eclipse SVN repositores
(Figure 1: directory structure)
Branches definition Rules: Project name + datetime + feature points, such as sns-home_20090506_profile, you must add labels when creating each branch.
3, create a new branch(Figure 2: Start creating a branch)
(Figure 3: Select the branch name and SVN resource path)
(Figure 4: Choose to start branching from head revision or specified revision)
(Figure 5: You must add a callout to this branch)
(Image 5 _ 1: Callout Branch)
1, when the branch version has been developed and tested, can be merged through Subeclipse to the trunk, you can merge the entire project can also be combined with a single file, such as
(Image 8: Multiple branches are changed)
2, if the Hi.java file has changed, then we will select the *trunk* under the Hi.java file (note is not under the branch Hi.java), and then right-click to select the Team->merge command
(Figure 9: Start merge)
3, select the merge pop-up following dialog box, specify the following,
Click "Merge" after confirmation and start the merge operation.
(Figure 10: Select a branch and the start and end versions of the branch)
4, after the completion of the merge, the files under the local trunk will be updated, note that this is only merged locally, and you will need to check again if the merged files are correct, and then use Team->commit to submit the merged content after reconfirmation.
5, the proposed merger, and then under the trunk of the modified content to test, it is best to a point at a point of testing, to ensure that the merged content is stable and correct.
5, mark the new version(Figure 6: Path to the new version)
(Figure 7: Definition rules for the new version)
(Image 11: Tag after merging)
Http://subclipse.tigris.org/branch_tag.html
SVN uses the branch/tag _ merge
Start building with 50+ products and up to 12 months usage for Elastic Compute Service
1 on 1 presale consultation
24/7 Technical Support 6 Free Tickets per Quarter Faster Response
Alibaba Cloud offers highly flexible support services tailored to meet your exact needs.
A comprehensive suite of global cloud computing services to power your business
Payment Methods We Support
