[Bug] Version of commit in develop merged to master changes if master is tagged #3105

Activity

1. mycroes

   added

   bug

   on May 2, 2022
2. asbjornu commented on Aug 25, 2022

   

   asbjornu

   on Aug 25, 2022

   Member

   More actions

   Different commits on different branches produce different version numbers. That's sort of the entire point of GitVersion. I don't see the problem here?
3. mycroes commented on Aug 26, 2022

   

   mycroes

   on Aug 26, 2022

   Author

   More actions

   The same commit on the same branch produces a different version number (after a new commit is added), that seems pretty awkward to me.
4. asbjornu commented on Aug 26, 2022

   

   asbjornu

   on Aug 26, 2022

   Member

   More actions

   What you are seeing is GitVersion working as it should. develop should always produce a higher version number than main or master. This is by design.
5. mycroes commented on Aug 26, 2022

   

   mycroes

   on Aug 26, 2022

   Author

   More actions

   Please carefully read the original issue. I fully understand what you're saying, that's not the issue I'm having. Thanks for looking into this!
6. asbjornu commented on Aug 27, 2022

   

   asbjornu

   on Aug 27, 2022

   Member

   More actions

   Can you please create a RepositoryFixture test that performs all the necessary steps as well as the version number assertions you expect along the way?
7. HHobeck commented on Sep 21, 2022

   

   HHobeck

   on Sep 21, 2022

   Last edited by HHobeck

   Contributor

   More actions

       [Test]
       public void __Just_A_Test__()
       {
           using EmptyRepositoryFixture fixture = new("develop");
   
           var configBuilder = ConfigBuilder.New;
   
           // Create commit A on develop
           fixture.MakeACommit();
   
           // ✅ succeeds as expected
           fixture.AssertFullSemver("0.1.0-alpha.1", configBuilder.Build());
   
           // Branch develop to main
           fixture.BranchTo("main");
   
           // ✅ succeeds as expected
           fixture.AssertFullSemver("0.0.1+1", configBuilder.Build());
   
           // Create commit B on main
           fixture.MakeACommit();
   
           // ✅ succeeds as expected
           fixture.AssertFullSemver("0.0.1+2", configBuilder.Build());
   
           // Tag commit B with next release version
           fixture.ApplyTag("1.0.0");
   
           // ✅ succeeds as expected
           fixture.AssertFullSemver("1.0.0", configBuilder.Build());
   
           // Checkout develop (still pointing to commit A)
           fixture.Checkout("develop");
   
           // ✅ succeeds as expected
           fixture.AssertFullSemver("1.1.0-alpha.0", configBuilder.Build());
   
           // Merge changes from main to develop
           fixture.MergeNoFF("main");
   
           // ✅ succeeds as expected
           fixture.AssertFullSemver("1.1.0-alpha.1", configBuilder.Build());
       }

   Actually this is maybe fixed in the PR #3190 . Are you agree?
8. mycroes commented on Sep 21, 2022

   

   mycroes

   on Sep 21, 2022

   Last edited by mycroes

   Author

   More actions

   Thx @HHobeck, I'm short on time and didn't know it would be this easy to write a test for it. This shows exactly what I meant, good work.

   Edit: not sure if PR fixes this, but the test matches

   👍React with 👍1Reacted by Hardy Hobeck
9. asbjornu

   closed this as completedin #3190on Oct 11, 2022
10. asbjornu

    added this to the 6.x milestone on Oct 11, 2022
11. arturcic

    modified the milestones: 6.x, 6.0.0-alpha.1 on Dec 22, 2022
12. arturcic commented on Dec 22, 2022

    

    arturcic

    on Dec 22, 2022

    Member

    More actions

    🎉 This issue has been resolved in version 6.0.0 🎉
    The release is available on:

    • GitHub Release
    • Chocolatey Package
    • .Net Global Tool

    Your GitReleaseManager bot 📦🚀