/
BRANCHING
47 lines (30 loc) · 1.36 KB
/
BRANCHING
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
This doc explains how to create/work/re-merge svn branches
#######################################
### make a new branch ###
#######################################
we will create a branch clone-skip-unstable
tag before the branch:
svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
https://svn.apache.org/repos/asf/perl/modperl/tags/pre-clone-skip \
-m "tag before branching for CLONE_SKIP support"
branch:
svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable \
-m "branching to provide CLONE_SKIP support"
check out:
svn co https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable mp2-clone-skip-unstable
change externals to point to the new A-T branch (if one was done)
svn propedit svn:externals .
#######################################
### sync the branch with the trunk ###
#######################################
the branch was created @r165203
svn co https://svn.apache.org/repos/asf/perl/modperl/branches/clone-skip-unstable \
mp2-clone-skip-unstable
cd mp2-clone-skip-unstable
svn propset merge-point 165203 .
build/svn.remerge
now resolve any conflicts and commit the changes
#######################################
### merge the branch into the trunk ###
#######################################