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

Update to latest 4.1 code #151

Open
kjk opened this issue Mar 19, 2019 · 3 comments
Open

Update to latest 4.1 code #151

kjk opened this issue Mar 19, 2019 · 3 comments

Comments

@kjk
Copy link
Contributor

kjk commented Mar 19, 2019

Putting this as a maybe.

I've ported against 4.0 branch. There's a fair amount of changes in 4.1 branch and it's non-linear with 4.0 branch so it's harder to figure out which Java check-ins need to be ported.
@ayende
Copy link
Member

ayende commented Mar 19, 2019

@ml054 Thoughts?

@ml054
Copy link
Member

ml054 commented Mar 19, 2019

@kjk I think the best way (which I'm using for porting changes from .net to java) is to create git between v4.0 and 4.1 branches and pass it to file, like this:

git diff v4.0 v4.1 > diff.diff

Then you can apply those changes. I delete applied content from this diff file. I know this file is big (852KB), but please notice most of changes are additions. You can also start from rewriting one test and then try to make it green by copying necessary code.

Next time this diff file will be smaller and changes will be easier to apply.

If you find better way of doing this - please let me know.

@kjk
Copy link
Contributor Author

kjk commented Mar 21, 2019

A list of unique checkins in v4.1 vs v4.0 (generated with https://gist.github.com/kjk/d0bae39b62d805605d4bf4b8bd677172). Oldest (first to port) first:

New in v41 (57), oldest first:

Maybe common checkins: 25

New in v40 (12), oldest first:

Common checkins: 211

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@kjk @ayende @ml054