Skip to content

0.2.0 wip #6

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

Merged
merged 2 commits into from
Aug 4, 2013
Merged

0.2.0 wip #6

merged 2 commits into from
Aug 4, 2013

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Jul 25, 2013

No description provided.

This was referenced Jul 25, 2013
Closed
@rvagg
Copy link
Member Author

rvagg commented Jul 27, 2013

@kkoopa & @trevnorris added you both to the copyright & contributors in 10c360a
feel free to edit your own details as you see fit.

@kkoopa
Copy link
Collaborator

kkoopa commented Jul 27, 2013

I've tested it on several projects on both 0.10 and 0.11.

@rvagg
Copy link
Member Author

rvagg commented Jul 28, 2013

Updated the changelog for 0.2.0, is there anything else you guys want to get in to a release?

@kkoopa
Copy link
Collaborator

kkoopa commented Jul 28, 2013

Let's fix #3 too, then all outstanding issues will be done.

@trevnorris
Copy link
Collaborator

@rvagg please remove the last sentence for my commit in 7ec7337 :)

@rvagg
Copy link
Member Author

rvagg commented Jul 29, 2013

it's going to have to stay unless you can work out how to rebase to that commit successfully, I'm having trouble rewinding the history, something's got messed up along the way that they don't replay nicely.

@trevnorris
Copy link
Collaborator

hm, strange.

@rvagg
Copy link
Member Author

rvagg commented Jul 30, 2013

Can you guys replace your current 0.2.0 branch with the current one here. I've rewound & rebased all of the commits, there was some odd conflict in the ordering and it seems to be fixed now. I've also been able to remove the line @trevnorris wanted removed from his Buffer::Use commit.

@kkoopa
Copy link
Collaborator

kkoopa commented Jul 30, 2013

Something is definitely a bit strange now. Should something be done to the string_encodings branch as well? It suddenly contains 40-something commits. Also, now there are repeated commits in the 0.2.0 branch, the beginning is repeated, and 5989795 has the wrong commit message, or author, or something... I'm not sure.

@rvagg
Copy link
Member Author

rvagg commented Jul 30, 2013

there's a bunch of stuff that's messed up, but there were about 5 commits of yours that somehow got inserted into separate branches by you and me, I have no idea how, but rebasing from any point messed things up because stuff seemed out of order. I was tempted at one point just to squash a bunch of commits and perhaps I ought to still do that to fix up some of those problems.
The master and 0.2.0 and tests branches are fixed now. If it's not too hard, you might want to recreate your string_encodings branch off 0.2.0 and manually reinsert your changes, perhaps just in one commit. That's what I ended up doing with my tests branch as rebasing caused just as many problems as I was trying to fix on 0.2.0.

@kkoopa
Copy link
Collaborator

kkoopa commented Jul 30, 2013

I was thinking of doing something like that, should not be too hard.

@rvagg rvagg merged commit 233c14c into master Aug 4, 2013
@rvagg
Copy link
Member Author

rvagg commented Aug 4, 2013

merged, therefore 0.2.0 is released. open a new -wip branch if you have things that ought to go in 0.3.0 or an 0.2.1 patch release.

thanks guys! amazing work.

@rvagg rvagg deleted the 0.2.0 branch August 4, 2013 23:58
@rvagg
Copy link
Member Author

rvagg commented Aug 5, 2013

just pushed out a quick 0.2.1 because 0.8 broke on the new NanFromV8String() where node::BUFFER isn't available so I just wrapped that whole case in an #if.

@kkoopa
Copy link
Collaborator

kkoopa commented Aug 5, 2013

@trevnorris said he'd look into what needs to be done for backporting the necessary functionality from v8, so there will be an 0.2.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.

3 participants