Skip to content

Invalid release version after commit beetween merge release to develop #1205

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.

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

Conversation

czesiu
Copy link
Contributor

@czesiu czesiu commented Apr 20, 2017

We detected problem with version calculating when someone will push commit beetween other person commit to release and merge to develop. Here's screen describing problem:
develop

Actions in repo which are required:

  1. Person A created & pushed commit 1 on release branch.
  2. Person A created merge commit (3) of release branch to develop.
  3. Person B created & pushed commit 2 on release branch.
  4. Person A pushed previously created merge commit (3) to remote repo.
  5. Person B created & pushed merge commit (4) of release branch to develop.

I reproduced that situation in unit test by using commit merge instead of branch merge.

// Check version on release after making some new commits
fixture.Repository.MakeACommit();
fixture.Repository.MakeACommit();
fixture.AssertFullSemver(config, "2.0.0-beta.4");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which version is produced here before your fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here 2.0.0-beta.3, but problem starts in previous assert (2.0.0-beta.1 instead of 2.0.0-beta.2).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants