Skip to content

Commit 110abbc

Browse files
9swampy9swampy
committed
Put default branch back to main.
1 parent 7a8ef76 commit 110abbc

File tree

4 files changed

+217
-4
lines changed

4 files changed

+217
-4
lines changed

‎CommitsSinceVersionSource.txt

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
2+
3+
@startuml
4+
skinparam participantMargin 10
5+
skinparam noteMargin 10
6+
skinparam shadowing false
7+
8+
participant main
9+
participant develop
10+
participant feature_f1
11+
participant release_1_1_0
12+
participant feature_f2
13+
participant release_1_2_0
14+
participant hotfix_hf
15+
16+
note right of main #LightBlue
17+
📝 Commit: A
18+
Version Source: A (initial commit)
19+
Commits beyond Version Source: none
20+
Version: 1.0.0
21+
end note
22+
23+
main --> develop: 🌿 branch develop from A
24+
25+
note right of develop #LightSkyBlue
26+
📝 Commit: B
27+
Version Source: A (already merged to develop)
28+
Commits beyond Version Source: B
29+
Version: 1.1.0-alpha.1
30+
end note
31+
32+
develop --> feature_f1: 🌿 branch feature/f1 from B
33+
34+
note right of feature_f1 #LightGreen
35+
📝 Commit: C
36+
Version Source: B (already merged to develop)
37+
Commits beyond Version Source: C
38+
Version: 1.1.0-f1.1+2
39+
end note
40+
41+
feature_f1 --> develop: 🔀 E (merge f1 → develop)
42+
43+
note right of develop #Khaki
44+
📝 Commit: E
45+
Version Source: E (develop tip)
46+
Commits beyond Version Source: none
47+
Version: 1.1.0-alpha.3
48+
end note
49+
50+
develop --> release_1_1_0: 🌿 branch release/1.1.0 from E
51+
52+
note right of release_1_1_0 #PaleGreen
53+
📝 Commit: F
54+
Version Source: E (already merged to develop)
55+
Commits beyond Version Source: F
56+
Version: 1.1.0-beta.1+4
57+
end note
58+
59+
release_1_1_0 --> main: 🔀 G (merge release/1.1.0 → main)
60+
61+
note right of main #Gold
62+
📝 Commit: G
63+
🏷 Tag: 1.1.0
64+
Version Source: G (main tip)
65+
Commits beyond Version Source: none
66+
Version: 1.1.0-5
67+
end note
68+
69+
main -> main: 🏷 tag 1.1.0
70+
71+
note right of main #Gold
72+
Version: 1.1.0
73+
end note
74+
75+
release_1_1_0 --> develop: 🔀 H (merge release/1.1.0 → develop)
76+
77+
note right of develop #Khaki
78+
📝 Commit: H
79+
Version Source: H (develop tip)
80+
Commits beyond Version Source: none
81+
Version: 1.2.0-alpha.1
82+
end note
83+
84+
develop --> feature_f2: 🌿 branch feature/f2 from H
85+
86+
note right of feature_f2 #LightGreen
87+
📝 Commit: I
88+
Version Source: H (already merged to develop)
89+
Commits beyond Version Source: I
90+
Version: 1.2.0-f2.1+2
91+
end note
92+
93+
feature_f2 -> feature_f2: Commit 'feature 2 additional commit (J)'
94+
95+
note right of feature_f2 #LightGreen
96+
📝 Commit: J
97+
Version Source: H (already merged to develop)
98+
Commits beyond Version Source: J
99+
Version: 1.3.0-f2.1+0
100+
end note
101+
102+
feature_f2 --> develop: 🔀 K (merge f2 → develop)
103+
104+
note right of develop #Khaki
105+
📝 Commit: K
106+
Version Source: K (develop tip)
107+
Commits beyond Version Source: none
108+
Version: 1.2.0-alpha.3
109+
end note
110+
111+
develop --> release_1_2_0: 🌿 branch release/1.2.0 from K
112+
113+
note right of release_1_2_0 #PaleGreen
114+
📝 Commit: L
115+
Version Source: K (already merged to develop)
116+
Commits beyond Version Source: L
117+
Beta parent: B.. E,F,G,H,I,J,K
118+
Version: 1.2.0-beta.1+8
119+
end note
120+
121+
release_1_2_0 --> main: 🔀 M (merge release/1.2.0 → main)
122+
123+
note right of main #Gold
124+
📝 Commit: M
125+
🏷 Tag: 1.2.0
126+
Version Source: M (main tip)
127+
Commits beyond Version Source: none
128+
Version: 1.2.0-5
129+
end note
130+
131+
main -> main: 🏷 tag 1.2.0
132+
133+
note right of main #Gold
134+
Version: 1.2.0
135+
end note
136+
137+
release_1_2_0 --> develop: 🔀 N (merge release/1.2.0 → develop)
138+
139+
note right of develop #Khaki
140+
📝 Commit: N
141+
Version Source: N (develop tip)
142+
Commits beyond Version Source: none
143+
Version: 1.3.0-alpha.1
144+
end note
145+
146+
main --> hotfix_hf: 🌿 branch hotfix/hf from M
147+
148+
note right of hotfix_hf #LightCoral
149+
📝 Commit: O
150+
Version Source: M (already merged to main)
151+
Commits beyond Version Source: O
152+
Version: 1.2.1-beta.1+1
153+
end note
154+
155+
hotfix_hf --> main: 🔀 P (merge hotfix → main)
156+
157+
note right of main #Gold
158+
📝 Commit: P
159+
🏷 Tag: 1.2.1
160+
Version Source: P (main tip)
161+
Commits beyond Version Source: none
162+
Version: 1.2.1-2
163+
end note
164+
165+
main -> main: 🏷 tag 1.2.1
166+
167+
note right of main #Gold
168+
Version: 1.2.1
169+
end note
170+
171+
hotfix_hf --> develop: 🔀 Q (merge hotfix → develop)
172+
173+
note right of develop #Khaki
174+
📝 Commit: Q
175+
Version Source: Q (develop tip)
176+
Commits beyond Version Source: none
177+
Version: 1.3.0-alpha.2
178+
end note
179+
180+
note right of feature_f2 #Orange
181+
⬅ Returned to feature/f2 at Commit J
182+
Version Source: J (already merged to develop)
183+
Commits beyond Version Source: none
184+
Version recalculates to: 1.3.0-f2.1+0
185+
end note
186+
187+
note right of feature_f2 #LightGreen
188+
Version: 1.3.0-f2.1+0
189+
end note
190+
191+
note right of feature_f2 #LightGreen
192+
📝 Commit: R
193+
Version Source: J (already merged to develop)
194+
Commits beyond Version Source: R
195+
Version: 1.3.0-f2.1+1
196+
end note
197+
198+
feature_f2 --> develop: --> rebase R onto develop tip Q
199+
200+
note right of feature_f2 #Thistle
201+
📝 Commit: R′
202+
Version Source: Q (develop tip)
203+
Commits beyond Version Source: R′
204+
Version: 1.3.0-f2.1+1 (after rebase)
205+
end note
206+
207+
@enduml

‎src/GitVersion.Core.Tests/Helpers/TestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace GitVersion.Core.Tests.Helpers;
77

88
public class TestBase
99
{
10-
public const string MainBranch = RepositoryFixtureBase.MainBranch;
10+
public const string MainBranch = "main";
1111

1212
protected static IServiceProvider ConfigureServices(Action<IServiceCollection>? overrideServices = null)
1313
{

‎src/GitVersion.Core.Tests/IntegrationTests/GitflowScenarios.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,10 @@ public void GitflowComplexExample()
7272
fixture.AssertFullSemver("1.2.0", configuration);
7373
fixture.Checkout(developBranch);
7474
fixture.MergeNoFF(release2Branch);
75-
if (!keepBranches) fixture.Repository.Branches.Remove(fixture.Repository.Branches[release2Branch]);
75+
if (!keepBranches)
76+
{
77+
fixture.Repository.Branches.Remove(fixture.Repository.Branches[release2Branch]);
78+
}
7679
fixture.AssertFullSemver("1.3.0-alpha.1", configuration);
7780

7881
// Hotfix
@@ -88,7 +91,10 @@ public void GitflowComplexExample()
8891
fixture.AssertFullSemver("1.2.1", configuration);
8992
fixture.Checkout(developBranch);
9093
fixture.MergeNoFF(hotfixBranch);
91-
if (!keepBranches) fixture.Repository.Branches.Remove(fixture.Repository.Branches[hotfixBranch]);
94+
if (!keepBranches)
95+
{
96+
fixture.Repository.Branches.Remove(fixture.Repository.Branches[hotfixBranch]);
97+
}
9298
fixture.AssertFullSemver("1.3.0-alpha.2", configuration);
9399

94100
fixture.Checkout(feature2Branch);

‎src/GitVersion.Testing/Fixtures/RepositoryFixtureBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace GitVersion.Testing;
99
/// </summary>
1010
public abstract class RepositoryFixtureBase : IDisposable
1111
{
12-
public const string MainBranch = "master";
12+
public const string MainBranch = "main";
1313
private readonly bool deleteOnDispose;
1414

1515
protected RepositoryFixtureBase(Func<string, Repository> repositoryBuilder, bool deleteOnDispose = true)

0 commit comments

Comments
 (0)