Detailed description of SVN branch and merge---command line

One, what is the use of SVN branching and merging?

For SVN, but familiar with the SVN branch, I think not much. Because in general, there is no need to do the SVN branch, in fact, there is no necessity. Let me give you a few examples of how to use the SVN branch:

1, larger than the project. Relatively large projects, in general, will be divided into several stages to finish. Like what five-year plan. At some stage, I set up a branch to be a backup. In case of future development of the next phase of things, when there is a fatal error, I can also take this branch out and then use.

2, the project to develop new things, but do not want to conflict with the main, set up a branch, as a separate development branch. This is also done for the purpose of clarifying responsibility. If something is wrong, check it out.

Second, create the SVN branch

Before you talk about creating a branch, please refer to Linux SVN installation and configuration for the installation and configuration of SVN, not in conjunction with Apache

1. Create a Code folder main

[Email protected] repos]# pwd
/home/zhangy/checkout/repos
[[email protected] repos]# svn Add./main
A Main
A main/test.php
[[email protected] repos]# svn commit./main-m "Test"
Adding Main
Adding main/test.php
Transmitting file data.
Committed Revision 5.

2, creating a branch

[[email protected] repos]# svn copy svn://127.0.0.1/repos/main svn://127.0.0.1/repos/branch-m "test"

Committed revision 6.

3. View branching status

[Email protected] repos]# svn log-v./branch/test.php
------------------------------------------------------------------------
R6 | Zhangy | 2010-10-24 19:59:35 +0800 (Sun, Oct 2010) | 1 line
Changed paths:
A/branch (From/main:5)

Test
------------------------------------------------------------------------
R5 | Zhangy | 2010-10-24 19:53:20 +0800 (Sun, Oct 2010) | 1 line
Changed paths:
A/main
a/main/test.php

Test
------------------------------------------------------------------------

4, the note between the matters:

A), creating a branch, which can only be done within the same warehouse, is not possible across warehouses. Will prompt Svn:no repository found in ' svn://127.0.0.1 '

b), when you create a branch, note that you add a comment, or the following error is reported.

[Email protected] repos]# svn cp svn://127.0.0.1/repos/main Svn://127.0.0.1/repos/branch
Svn:could not use external editor to fetch log message; Consider setting the $SVN _editor environment variable or using the--message (-m) or--file (-f) options
Svn:none of the environment variables svn_editor, VISUAL or EDITOR is set, and no ' Editor-cmd ' run-time configuration op tion was found

Three, merging branches

Here is an example of how to merge a branch. I think that through the example, the most can learn something, I Boven in my emphasis on this point.

1, modify the file in main to submit to the SVN server side, so that the main code and branch branch of the code is not the same.

2. Synchronize the files in the main file into the branch branch

View copy print?

2. [[email protected] branch]# pwd //Whether in the branch folder
4. /home/zhangy/checkout/repos/branch
6. /**
8. Synchronize the changes in main to the branch branch
10. If it is the specified version can be svn merge-r 9:10 svn://127.0.0.1/repos/main
12. */
14. [[Email protected] branch]# svn merge svn://127.0.0.1/repos/main
16. ---merging R6 through R8 into '. ': //Update to 8th version
18. U test.php
20. [[Email protected] branch]# svn log-v test.php //View test.php, from below we can see that the branch version has not become what?
22. ------------------------------------------------------------------------
24. R6 | Zhangy | 2010-10-24 19:59:35 +0800 (Sun, Oct 2010) | 1 line
26. Changed paths:
28. A/branch (From/main:5)
32. Test
34. ------------------------------------------------------------------------
36. R5 | Zhangy | 2010-10-24 19:53:20 +0800 (Sun, Oct 2010) | 1 line
38. Changed paths:
40. A/main
42. a/main/test.php
46. Test
48. ------------------------------------------------------------------------
50. [[Email protected] branch]# svn commit-m "test" //Submit
52. Sending.
54. Sending test.php
56. Transmitting file data.
58. Committed Revision 9.
60. [[Email protected] branch]# svn log-v test.php //Yes No because there is no commit, a new version will be generated after submission
62. ------------------------------------------------------------------------
64. R9 | Zhangy | 2010-10-24 20:52:22 +0800 (Sun, Oct 2010) | 1 line
66. Changed paths:
68. M/branch
70. m/branch/test.php
74. Test
76. ------------------------------------------------------------------------
78. R6 | Zhangy | 2010-10-24 19:59:35 +0800 (Sun, Oct 2010) | 1 line
80. Changed paths:
82. A/branch (From/main:5)
86. Test
88. ------------------------------------------------------------------------
90. R5 | Zhangy | 2010-10-24 19:53:20 +0800 (Sun, Oct 2010) | 1 line
92. Changed paths:
94. A/main
96. a/main/test.php
100. Test
102. ------------------------------------------------------------------------

The merger here is basically over.

3, the above said is the backbone of the file synchronization to the branch, the branch of the content synchronization step trunk is the same, upside down on the line.

4, all and the time, there may be conflicts, look below

View copy print?

2. [[Email protected] main]# svn merge svn://127.0.0.1/repos/branch
4. Conflict discovered in ' test.php '. //prompt conflict
6. Select: (P) postpone, (DF) Diff-full, (e) Edit, //Here you choose how to handle
8. (MC) Mine-conflict, (TC) Theirs-conflict,
10. (s) Show All Options:p
12. ---merging R7 through R12 into ' test.php ':
14. C test.php
16. Summary of conflicts:
18. Text conflicts:1 //Although there is a conflict, but still can be synchronized, also indicates that the synchronization was successful.
22. ---/tmp/tempfile.2.tmp Sun Oct 24 21:02:11 2010
24. + + +. Svn/tmp/test.php.tmp Sun Oct 24 21:02:11 2010
26. @@ -0,0 +1,9 @@
28. +<<<<<<<. Working
30. +asdfadfadfadf
32. +111111111111111
34. +=======
36. +asdfadfadfadf
38. +111111111111111
40. +222222222222
42. +
44. +>>>>>>>. Merge-right.r12

1

Detailed description of SVN branch and merge---command line