-
Notifications
You must be signed in to change notification settings - Fork 0
/
00branches.txt
117 lines (104 loc) · 4.73 KB
/
00branches.txt
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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
This is our configuration management map. Be careful to only maintain
it in the trunk: it reflects all branches, tags, and whatnot, and
therefore it should be maintained outside of version control. At least
theoretically; in practice, we need to put it somewhere -- and that's
the trunk.
The nomenclature of CM artifacts is taken from the book "Pragmatic
Version Control Using Subversion" by Mike Mason, and it reads as
follows.
Release Branch RB-<rel>
Release REL-<rel>
Bug fix branch BUG-<track>
Pre-bug fix PRE-<track>
Post-bug fix POST-<track>
Developer experiments TRY-<developer>-<short-desc>
+ (subversion migration)
|
REL-2.0.0pre13 +
|
131----+
REL-2.0.0pre14 134 |
REL-2.0.0pre15 139<---138
| v TRY-jfasch-kde-hack(merged,dead)
|
184----+
REL-2.0.0pre18 200<---198
| v devlopment/jfasch/library-dependencies(merged,dead)
|
200----+
213<---212
| v TRY-jfasch-builder-init-state(merged,dead)
|
216----+
REL-2.0.0pre19 220 |
REL-2.0.0pre20 227 |
247<---246
| v TRY-jfasch-nonlocal-headers(merged,dead)
|
247----+
REL-2.0.0pre24 257--- | -------------------------------------+
260<---256 |
| v TRY-jfasch-relocated-headers(merged,dead)
| 277+REL-2.0.0pre24.1
284<------------------------------------------+280
| v TRY-jfasch-bug-1713807(merged,dead)
|
286---------------------------+
| 289 REL-2.0.0
| 305 REL-2.0.1
| 308 REL-2.0.2
311<--------------------------310
| |
| v RB-2.0
|
313-----------------------+
336<----------------------+333 REL-2.1.0pre1
| v TRY-jfasch-initialbuilders-refactoring(merged,dead)
|
336-------------------------------------------+
345 REL-2.1.0pre2 |
349---------------------------+ |
| 352 REL-2.1.0 |
| | |
354----+ | v TRY-visual-studio
359<---+ |
| v TRY-condlocalinstall(merged,dead)
| |
360<--------------------------359
| |
378<--------------------------375
385-------------------------- | ---------+
428<------------------------- | ---------+ 427
| | v TRY-filesys-overlay(merged,dead)
| |
438-------------------------- | ---------+
| <--------------------------447 v TRY-relocated-c(unmaintained,dead)
| |
497-------------------------- | ---------+
640---------+ | |
| 641 REL-2.2.0 | |
653<------- | --------------- | ---------+ 649
| v RB-2.2 | |
| | v TRY-jfasch-automake-plugin(dead)
(ongoing cmake| |
development) | |
| v RB-2.1
867------------+
| |
| 872 REL-2.3.0
| 889 REL-2.3.1
| 894 REL-2.3.2
| |
| 900 REL-2.3.6
| |
| 947 REL-2.3.8
| |
| <------------+ 949
| |
| v RB-2.3
|
|
|
|
|
v