-
-
Notifications
You must be signed in to change notification settings - Fork 177
Conversation
Conflicts: package.json src/batch.cc src/database.cc src/database.h src/database_async.cc src/iterator.cc src/iterator_async.cc src/leveldown.cc src/leveldown.h
Conflicts: package.json src/database.cc src/database.h src/leveldown.cc
@mcollina Very awesome! What is the biggest differences between |
@mcollina Want me to take a look at the manual merge? |
awemazing! |
Ok. I'm taking a look at this merge conflict.
<<<<<<< HEAD
NanNull()
||||||| merged common ancestors
NanNewLocal<v8::Value>(v8::Null())
=======
NanNew(NanNull())
>>>>>>> v0.10.x-iojs |
I think it should not be merged in, but rather the other way around, In many ways, this is not a pull request, but rather a proposal for a @rvagg what do you think?
|
Actually it's a good idea to have this merge. We will get the conflicts later anyway and might as well solve them now? :) |
@mcollina I added a new PR with the solved conflicts, so we could merge that one instead. |
It is not supposed to be merged ever. We have an awesome 1.0 that looks Also I had some conflicts even in node between leveldown and nodegit that
|
But please, test this one against levelup's unit tests, so we know if
|
Tests run fine on
|
A bit heavier than I'd prefer a patch bump to be but I don't think I see anything in here that's of real concern. If there's no -1's here then how about you put this in a "v0.10" branch and we'll let it live there and I'll publish. The next question is, should we make this |
@rvagg That's a splendid idea and most of all it will buy some time. |
@mcollina I don't know why I wanted to merge in the first place. I didn't think of separate version tracks. |
@rvagg I've pushed a |
👍 for bumbing |
Can anybody else in the team review it, so we publish it on NPM? Thanks! |
@rvagg is there anything blocking you to release this? I can help if needed! |
@@ -1,7 +1,7 @@ | |||
{ | |||
"name": "leveldown", | |||
"description": "A Node.js LevelDB binding, primary backend for LevelUP", | |||
"version": "0.10.2", | |||
"version": "0.10.3", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should leave this to the releaser (me) btw, it's part of the npm version
workflow and the commit gets signed as well.
it's crashy on 0.11 and 0.12:
|
fixed the crashiness in 6ea9962 borked a publish as 0.10.3, it got 1/2 way and the registry now thinks there's an unpublished 0.10.3, so published as 0.10.4
thanks for the hard work on this @ralphtheninja and @mcollina, and thanks for nagging me, I feel very guilty about the whole levelup/down situation right now, it's like my own personal Node 0.12 and that's quite shameful! |
🍰 |
I backported some of the changes for making all tests of 0.10.2 pass in iojs and with nan 1.5.
It is not a PR in the general sense, if you are good with it you should release it as 0.10.3 so all modules depending on current level will be fixed.