Re: Ports/Backports


Chris Hupman <chris...@...>
 

I looked at all the PRs targeting 0.2 and currently I'm only really optimistic about 1575 making it in for the release. Right now the only thing I would consider delaying for is 1479, the service-wrapper PR, but I'm hoping to close that out this week. Here are my notes on the 4 PRs.

I did a full pass on this, but I want a second binding approval before this gets merged. I did some digging, but I still don't have a clear picture in my head of what acquireLocks() should look like.

I approved, but it will require a second approval to merge. At least the test will be easy to merge upstream.

This PR should probably be targeting master, otherwise you'll need to address the test failures on es1 and es2. I didn't do a review since it wasn't passing CI.

I did a pass and there were two items to resolve. The main one being adding a test. Since it requires a mock I would rather it goes into 0.3 or 0.4 so that we won't have to convert the test from easyMock to Mockito and junit 4 to junit 5.

Just so I understand better is there a push to get into 0.2.3 so you won't have to update to 0.3.x to get access to the features? Or did you just target 0.2 so the changes would make it into all the releases?

Cheers,

Chris


On Tuesday, May 14, 2019 at 5:10:10 AM UTC-7, Florian Hockmann wrote:
The problem is just that we recently decided to close branch 0.2 and only make a last release of that branch and then close it for development. Any new pull requests that now target 0.2 could therefore either postpone that release or if they are merged after the release, we need to merge them into 0.3 and from their into master. That is why I suggest that you try to target 0.3 instead for bug fixes or master for new features / enhancements. It shouldn't usually be a problem for you to rebase a feature branch on one of these release branches.

Am Montag, 13. Mai 2019 23:13:32 UTC+2 schrieb Chris Hupman:
We regularly merge commits upstream. You just need to worry about submitting the Pull Request you want to get in. If you want to take care of merging it into all branches here's a comment with an example.

 Changes to all release branches will also be merged into master

On Monday, May 13, 2019 at 1:29:32 PM UTC-7, wri...@... wrote:
Hi Janusgraph Team, 

We've just become a contributors and would like to push our changes to public repository.
The thing is that all changes are based on 0.2 version - the version we use in production.
How it'd suitable to review and (back)port the changes?
- Start from 0.2 branch and then port to master?
- (Vice versa) Start from master and then backport to 0.2?

Thanks

Join janusgraph-dev@lists.lfaidata.foundation to automatically receive all group messages.