Use SVN for multi-version development tutorials and svn version development tutorials
During android development, you will surely encounter multi-version development. The following describes the specific implementation steps.
SVN directory Introduction
Branch Directory: stores the copy of the branch, and the branches of each project version related to the project. The version branches under this directory can be modified and merged. It is not a stable version.
Document directory: documents related to the project.
Tag Directory: stores the copy of the tag. Each release version associated with the project is stable and available in this directory without modification.
Trunk Directory: stores the development "Main Line", the main directory, used for normal current work, the Code directory to be submitted every day.
For example, during android development, version 1.0 has been launched and runs quite stably. The company plans to develop version 2.0 and Version 2.0 for a while, some users find a major bug, and then call a developer to fix the bug of version 1.0. After the fix is completed, the bug is merged to version 2.0 under development.
Procedure:
1. Development version 1.0: Create an android project, develop Version 1.0, and submit it to the master trunk directory.
2. Release Version 1.0: Right-click the project, Team, branch/Tag, Click Browse, select the Root tags folder, splice "/v1.0" after the URL, and click "NEXT, click NEXT, enter the comment "version 1.0 released", and click Finish. Now, the Tag is ready.
3. Develop version 2.0 and submit the written code to the master trunk directory every day.
4. It was found that version 1.0 had A major bug. The programmer A fixed version 1.0 bug and others continued to develop version 2.0.
5. Switch to version 1.0: programmer A, select project, right-click Team, switch, select tags/v1.0 URL, and click OK.
6. Because the project under the tag directory is not modified, branch version 1.0 under the tag directory to the branch directory, select the project, right-click, Team, branch/tag, and click browse, select the branches folder under Root, splice "/v1.0 _ fixup" after the URL, click NEXT, click NEXT, enter the comment "version 1.0 revision", and click Finish, the branches branch is ready.
7. Switch to version v1.0 _ fixup under branches, programmer A, select project, right-click, Team, switch, select the URL of branches/v1.0 _ fixup, and click OK.
8. Fix the bug in version 1.0. After the fix is completed, submit it to the server.
9. Release Version 1.1, right-click the project, Team, branch/Tag, Click Browse, select the Root tags folder, splice "/v1.1" after the URL, and click "NEXT, click NEXT, enter "Fix version 1.0 bug", and click Finish. Now, the Tag is ready.
10. Switch to the trunk directory of the main line and merge the modifications to version 1.0 to the 2.0 version under development. programmer A switches to the trunk directory of the main line, select the project, right-click, Team, merge, NEXT, click select to select the v1.0 _ fixup version under branches, click NEXT, and click FINISH. If a conflict exists, resolve the conflict and submit it to the server.
