Yea, ideally fast-forward merged to preserve the SHA. If that's not
possible, then cherry-picked.
On Thu, Feb 21, 2013 at 4:54 PM, Shazron wrote:
> Cool - then those two commits should be cherry-picked into next since they
> are part of the next release
>
>
> On Thu, Feb 21, 2013 at 4:53 PM, Mic
Cool - then those two commits should be cherry-picked into next since they
are part of the next release
On Thu, Feb 21, 2013 at 4:53 PM, Michael Brooks wrote:
> TLDR; Yes
>
> My understanding is that any commits that you want to appear in the "next"
> release, then put them into next.
>
> All co
TLDR; Yes
My understanding is that any commits that you want to appear in the "next"
release, then put them into next.
All commits into "next" will eventually be merged into "master" as well for
the future releases.
Michael
On Thu, Feb 21, 2013 at 4:27 PM, Shazron wrote:
> Should these two co
It depends on if the platform has another way of storing data. I do
agree that the solution that requires the least amount of effort is
the right one in this case. I just made sure that we turn off WebSQL
on WebKit and just use our own version on Android.
On Thu, Feb 21, 2013 at 3:20 PM, Jesse
We will not be adding new databases or removing old ones. The priority
for WebSQL is super low. We will just continue to allow whatever the
onboard browser allows.
On Thu, Feb 21, 2013 at 2:50 PM, Giorgio Natili wrote:
> So your are suggesting to remove it from Cordova in favor of IndexDB?
>
> On
I am suggesting do not resuscitate, or at least no heroic measures. If it
can be easily fixed, then I would do it, but otherwise, advise of other
ways of storing data.
Something like LawnChair might make sense.
http://brian.io/lawnchair/adapters/
On Thu, Feb 21, 2013 at 2:50 PM, Giorgio Natili
Thanks for the confirmation. Pushed to apache.
-- Marcel Kinard
On Feb 21, 2013, at 5:06 PM, Michael Brooks wrote:
> This is totally normal.
>
So your are suggesting to remove it from Cordova in favor of IndexDB?
On 2/21/13 9:26 PM, "Jesse" wrote:
>As an aside, WebSQL is a deprecated storage spec, and is not supported on
>WP7, WP8, or Windows 8.
>WP8 and Win8 do however support IndexedDB, and apparently BB10 does too.
>
>On Thu, Feb 21
>
> Could/Should we write a pre-push-hook, s.t. when pushing 'next' to check
> that it has been merged into master, at least locally?
I think we should avoid adding more architecture management code for now.
I've got a few opinions and suggestions on the current git workflow, but I
want to hold m
>
> 289 files changed, 19759 insertions(+), 132 deletions(-)
> All rhe 2.5.0rc1 files were added, and most if not all of the edge files
> had 2 or more line changes each. That doesn't look right to me, so I did
> not do the "git push apache master". I wanted to stop and ask for advice
> before I di
One might even imagine automating merges from next into master somehow?
Could/Should we write a pre-push-hook, s.t. when pushing 'next' to check
that it has been merged into master, at least locally?
On Thu, Feb 21, 2013 at 4:55 PM, Andrew Grieve wrote:
> If I do the same thing with a clean cl
If I do the same thing with a clean client (merge next into master), then I
get the same thing.
I think what happened is that we generated a new version of docs
at: docs/en/2.5.0rc1 on the next branch, but haven't yet merged that into
master.
So... I think you're fine. :)
On Thu, Feb 21, 2013 a
I was following the ContributorWorklow to fix these docs in both next and
master. The commit and push to next (see attached) looks good. However, when I
did "git merge next" after "git checkout master", I saw way more changes than I
expected:
289 files changed, 19759 insertions(+), 132 deletion
Cool. Will do!
-Steve
On Thu, Feb 21, 2013 at 11:46 AM, Filip Maj wrote:
> Cordova-cli tagged and pushed to npm as 2.5.0.
>
> Steve, all subtasks done. You can generate a release now!
>
> Great job team!
>
> On 2/20/13 3:26 PM, "Tim Kim" wrote:
>
> >I've tagged BlackBerry but the media tests s
As an aside, WebSQL is a deprecated storage spec, and is not supported on
WP7, WP8, or Windows 8.
WP8 and Win8 do however support IndexedDB, and apparently BB10 does too.
On Thu, Feb 21, 2013 at 11:27 AM, Joe Bowser wrote:
> OK, here's some annoying crap that the Android team did to the
> browse
I was trying to follow #2 and didn't want the merge commit in the next
branch. So, I took a deep breath and slogged through.I cherry-picked
each commit, rebased to squash them together, merged into next and pushed
to next. Then I could checkout master, merge next, and then push master.
I
Cordova-cli tagged and pushed to npm as 2.5.0.
Steve, all subtasks done. You can generate a release now!
Great job team!
On 2/20/13 3:26 PM, "Tim Kim" wrote:
>I've tagged BlackBerry but the media tests still crash the mobile spec
>auto
>test. Not much we can do about this right now since we're
I also think Fil should be more chill ;)
Just kidding, obviously the conclusions are satisfactory. Clearly, writing
is hard.
-Michal
On Thu, Feb 21, 2013 at 2:24 PM, Andrew Grieve wrote:
> I think so! Thanks everyone for working through this with me.
>
>
> On Thu, Feb 21, 2013 at 2:08 PM, Fi
OK, here's some annoying crap that the Android team did to the
browser. Back in Honeycomb, file:// was no longer allowed to use the
WebSQL database because of security reasons. I have no idea what
those security reasons are, but this is the same case all the way up
to Jellybean. Therefore, we use
I think so! Thanks everyone for working through this with me.
On Thu, Feb 21, 2013 at 2:08 PM, Filip Maj wrote:
> Hope the conclusions in this thread are satisfactory.
>
> Andrew, I apologize for the tense tone in my emails yesterday. I should
> have been more chill about it.
>
> On 2/20/13 7:5
There is no reason why we should do that. It seems like a 0 day bug to me.
Simon Mac Donald
http://hi.im/simonmacdonald
On Thu, Feb 21, 2013 at 2:05 PM, Filip Maj wrote:
> I want to say that we needed this to polyfill on some older Androids.. But
> this is speculation :s
>
> On 2/20/13 4:06 PM,
Hope the conclusions in this thread are satisfactory.
Andrew, I apologize for the tense tone in my emails yesterday. I should
have been more chill about it.
On 2/20/13 7:52 PM, "Michael Brooks" wrote:
>Sounds awesome Andrew, thanks for the concise recap.
>
>I agree, JIRA isn't the ideal solutio
I want to say that we needed this to polyfill on some older Androids.. But
this is speculation :s
On 2/20/13 4:06 PM, "Joe Bowser" wrote:
>While investigating this irritating issue
>(https://issues.apache.org/jira/browse/CB-2085), I found that when we
>first open the database, we are using the b
I had that same concern at some point, but I've just learned to live with
them. In the end, unless they are abused (such as doing work on master and
having merge commit with each pull), merge commits can be useful and give
insights, so shouldn't necessarily be avoided at all costs.
On Thu, Feb 2
You get a merge commit any time you try to merge in a branch that is not
fast-forward (the internet can explain this better than I can).
You have two options to not have a merge commit:
1. Cherry-pick both commits, one after the other
2. Create a local branch based off of the remote one, rebase it
Ah, somehow I missed that step when I changed email accounts. Thanks Shaz!
On Wednesday, February 20, 2013, Shazron wrote:
> Isn't it refreshing? Subscribe to iss...@cordova.apache.org now.
>
> On Wednesday, February 20, 2013, Kevin Hawkins wrote:
>
> > Does anyone else not get JIRA bugs copied
Filed an INFRA ticket for ReviewBoard:
https://issues.apache.org/jira/browse/INFRA-5889
On Tue, Jan 22, 2013 at 10:59 AM, Andrew Grieve wrote:
> ReviewBoard seems like a great fit to me! Let's try it out!
>
>
> On Mon, Jan 21, 2013 at 8:43 PM, Brian M Dube wrote:
>
>> On 01/21/2013 01:24 PM, Jo
27 matches
Mail list logo
