Extend git flow complex example to post merge and rebase behaviour #4585
+128
−49
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9swampy
force-pushed
the
ExtendGitFlowComplexExampleToPostMergeAndRebaseBehaviour
branch
from
1586c8e to
45f96cc
Compare
This was referenced Jun 22, 2025
|
@HHobeck, I think these changes look reasonable. What are your thoughts on this? |
9swampy
commented
Jun 24, 2025
| @@ -7,7 +7,7 @@ namespace GitVersion.Core.Tests.Helpers; | |||
|
|
|||
| public class TestBase | |||
| { | |||
| public const string MainBranch = "main"; | |||
| public const string MainBranch = RepositoryFixtureBase.MainBranch; | |||
There was a problem hiding this comment.
#4589 Magic strings >> BranchConfigurationKey.
9swampy
commented
Jun 24, 2025
| fixture.MakeACommit( | ||
| "feature 2 additional commit after original feature has been merged to develop " + System.Environment.NewLine + | ||
| $"and release/1.2.0 has already happened >> {fullSemver}" + | ||
| "Problem #1: 1.3.0-f2.1+0 is what I observe when I run dotnet-gitversion 6.3.0 but in the repo the assertion is 1.3.0-f2.1+1" + |
There was a problem hiding this comment.
Problem 1:
- 1.3.0-f2.1+1 is what the test asserts
- 1.3.0-f2.1+0 is what I observe when I run dotnet-gitversion 6.3.0
9swampy
commented
Jun 24, 2025
| $"and release/1.2.0 has already happened >> {fullSemver}" + | ||
| "Problem #1: 1.3.0-f2.1+0 is what I observe when I run dotnet-gitversion 6.3.0 but in the repo the assertion is 1.3.0-f2.1+1" + | ||
| "After rebase 1.3.0-f2.1+3 is both what the test asserts and what I observe when I run dotnet-gitversion 6.3.0." + | ||
| "Problem #2: I expected to get the same before and after the rebase." + |
There was a problem hiding this comment.
Problem 2:
- Before rebase 1.3.0-f2.1+1 is what the test asserts (but not what dotnet-gitversion produces - see Problem 1).
- After rebase 1.3.0-f2.1+3 is what both tests and dotnet-gitversion 6.3.0 produce.
I'd have anticipated1.3.0-f2.1+1 both before and after rebase, in this specific scenario.
9swampy
commented
Jun 24, 2025
| var yaml = new ConfigurationSerializer().Serialize(concreteConfig); | ||
| const string fileName = "GitVersion.yml"; | ||
| var filePath = FileSystemHelper.Path.Combine(r.Info.Path, "..", fileName); | ||
| File.WriteAllText(filePath, yaml); |
There was a problem hiding this comment.
Intentionally writing out the GitVersion.yml to demonstrate inconsistency between UnitTest version calculation and running dotnet-gitversion from the commandline. Refer to 2 problems in commentary.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Extend the GitFlowComplexExample to document unexpected post merge and rebase behaviour.
Fix the integration test fixtures so they can accept a "master" main branch instead of hardcoding "main".
Related Issue
Motivation and Context
I have been really struggling to get GitVersion to work post the v6 changes so I checked out the repo to run through sample scenarios to try and adapt but I either need more documentation to understand what the new behaviour is or the new behaviour is possibly unintended.
Rather than just rely on the Integration tests with injected configuration, I wanted to be able to revisit the repository that is created by the integration test and I observe
How Has This Been Tested?
GitFlowComplexExample
Screenshots (if appropriate):
Checklist:
This is a WIP proposal to document a problem & ask for help; if I get direction I'm happy to update the PR as offered/advised.