Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bugfix] Wrong version number observed in a feature branch after a tagged develop is merged into it #1446

Merged
merged 6 commits into from
Feb 25, 2019
Merged

[Bugfix] Wrong version number observed in a feature branch after a tagged develop is merged into it #1446

merged 6 commits into from
Feb 25, 2019

Conversation

ruhullahshah
Copy link
Contributor

@ruhullahshah ruhullahshah commented Jul 24, 2018 •
edited
Loading

  • The testcase (failing as of now) is pretty self-explanatory and outlines the problem.

@ruhullahshah
Copy link
Contributor Author

ruhullahshah commented Jul 24, 2018 •
edited
Loading

@JakeGinnivan [The function suggested that you might be the candidate to answer this]

  • While analysing the code, I saw that you guys set the Increment to Patch here, is there a specific reason for that?
  • This causes the the tagged commit strategy to yield 16.23.1-feat-featX.4 instead of 16.24.0-feat-featX.4

@jbaehr
Copy link
Contributor

jbaehr commented Dec 11, 2018

@JakeGinnivan ping! would you please have a look at Ruh's questions above? unfortunately this issue still pops up from time to time...

@jbaehr jbaehr mentioned this pull request Dec 11, 2018
Closed
@asbjornu
Copy link
Member

It seems like we have quite a few loosely (or closely) related bugs here in this, #1600, #1598 and #1595 (which are rebased versions of #1261, #1533 and #1394). It would of course be great if all birds could be killed with one stone, but I'm not sure how cloesly related these bugs are. I would love to dig into what the source of the problems are and figure out one or more fixes, but I just don't have the time. Perhaps adding all of the failing tests into one PR that I can maintain might be a good idea to make it easier to pick up for someone to fix?

asbjornu and others added 3 commits February 20, 2019 22:14
@asbjornu
Merge branch 'master' into version_number_calculation_fix
f5a665d
@ruhullahshah
Merge branch 'master' into version_number_calculation_fix
76fc99f
When the chosenBranch for inheriting the configuration
b6a6189 
is master or develop, use its IncrementStrategy instead
of arbitrarily setting it to Patch. Fixed the failing test,
Corrected the version number in one of the old tests
@ruhullahshah ruhullahshah changed the title [WIP] Wrong version number observed in a feature branch after a tagged develop is merged into it [Bugfix] Wrong version number observed in a feature branch after a tagged develop is merged into it Feb 25, 2019
@ruhullahshah
Copy link
Contributor Author

ruhullahshah commented Feb 25, 2019 •
edited
Loading

Added a patch that fixes the issue.

Analysis:

While trying to inherit the branch configuration for a merged branch, develop or master are the chosen candidates, however, "for some reason", their defaults are not used and the IncrementStrategy was set to Patch, which is incorrect.

Fix:

In case the chosen branch for resolution is master or develop, use the corresponding IncrementStrategy, if it is not set to Inherit

@asbjornu asbjornu merged commit 14b7365 into GitTools:master Feb 25, 2019
@asbjornu asbjornu added this to the 5.0.0 milestone Feb 25, 2019
@asbjornu
Copy link
Member

Fantastic, @ruhullahshah. Thanks!

@ruhullahshah
Copy link
Contributor Author

@asbjornu You are welcome :D

@ruhullahshah ruhullahshah deleted the version_number_calculation_fix branch February 25, 2019 14:15
@asbjornu
Copy link
Member

I had hoped this would fix #1595, #1598 and #1600, but unfortunately not. 😕

@ruhullahshah
Copy link
Contributor Author

ruhullahshah commented Feb 25, 2019 •
edited
Loading

@asbjornu The only issue, in my opinion, that is related to this merge request is #1525 and after taking a brief look at the testcases for the issues you mentioned above, I do not see the fix related to them,

@ruhullahshah
Copy link
Contributor Author

#1598 is composed of two testcases:

  • One is being addressed here
  • and the second one is related to CommitsSinceVersionSource, which is a problem for us as well.

I can fix try to fix the CommitsSinceVersionSource , if I get some feedback on the comment

@arturcic arturcic added the Bug label Mar 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
5.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@ruhullahshah @jbaehr @asbjornu @arturcic