beacon-biosignals / TimeSpans.jl

A Julia package that provides a `TimeSpan` type for representing a continuous span between two points in time.
Other
6 stars 2 forks source link

Backport features introduced in 0.3.x to 0.2.x #38

Closed ararslan closed 2 years ago

ararslan commented 2 years ago

I've created a branch release-0.2 that we can use for tagging further v0.2.x versions. That branch is the base branch of this PR. I've cherry-picked #24 and #36 and set the package version to v0.2.8.

IMO it would make sense to temporarily re-allow merge commits so as not to squash the individual cherry-picked commits but I don't think it matters too much. I can do the settings dance if folks agree.

Fixes #37.


For reference for those new to backporting, this is how I did this:

git checkout v0.2.7
git checkout -b release-0.2
git push origin release-0.2
git checkout -b aa/backport-v0.2
git cherry-pick -x -e bdd1e0200f727c2d59ddb90d30eb34c7495adc48  # PR 24
# Fixed conflict
git cherry-pick -x -e eb327966a96776b1b5f9980ad18e3719930d8279  # PR 36
# Set Project.toml version
git push origin aa/backport-v0.2

Any future PRs to create more v0.2.x versions can be made by:

git checkout -b xx/branch-name release-0.2

then opening a PR with release-0.2 as the base branch.

mich11 commented 2 years ago

@ararslan, I've got a question - it looks like 0.2.7 (#29 ) is the version that actually might be the one that actually has the breaking change. That doesn't fit with it's version number, but @ericphanson mentioned it in his description of the version conflict with Onda. In that case, should the branch be from v0.2.6?

ararslan commented 2 years ago

Very good catch! Indeed, v0.2.7 was yanked from the registry (https://github.com/JuliaRegistries/General/blob/master/T/TimeSpans/Versions.toml#L27). I'll restructure to go from v0.2.6, both for the release-0.2 branch and the backports.

ararslan commented 2 years ago

Done! release-0.2 has been reset to v0.2.6 and this PR has been redone atop that.

ararslan commented 2 years ago

I've temporarily reenabled merge commits.

ararslan commented 2 years ago

Merge commits are now once again disabled and I've enabled branch protection on release-0.2.