De nada. Simon Mac Donald http://hi.im/simonmacdonald
On Thu, Mar 1, 2012 at 11:24 AM, Joe Bowser <[email protected]> wrote: > OK, my bad, I'm still going off the old github one. I'll pull the Apache > repo and make sure that everything is sync'd up and working. Sorry about > that. > > On Thu, Mar 1, 2012 at 7:50 AM, Simon MacDonald > <[email protected]>wrote: > >> Um, I was under the impression that we were using the Apache git repo >> as the canonical repo and that's where we should be doing our >> checkins. All of the fixes that Fil and I have done this week have >> gone into: >> >> >> https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-js.git;a=summary >> >> When you did your latest commit: >> >> >> https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-android.git;a=commit;h=7bf35e9c83ca9621b761f887103b79b22e024f8d >> >> the cordova.android.js file you checked in is missing many of those >> fixes. I've added your fix for Capture to the Apache git and done a >> build of cordova.android.js and checked it into the Apache Android git >> repo. >> >> The Apache Android git repo should now be fully up to date. >> >> Simon Mac Donald >> http://hi.im/simonmacdonald >> >> >> >> On Wed, Feb 29, 2012 at 11:35 PM, Joe Bowser <[email protected]> wrote: >> > I actually noticed differences between the JS files as I was working on >> it >> > today. I kept generating the JS from the callback-js, and I noticed that >> > WebSQL was still broken when I did a rebuild from the callback-js repo. >> > Also, there was a conflict when we fixed the Capture API and fixes for >> the >> > file API. That's why I wrote the reminder in the commit log, since I >> > didn't want to break things again, and to remind everyone to check in the >> > callback repo. >> > >> > On Wed, Feb 29, 2012 at 8:08 PM, Bryce Curtis <[email protected] >> >wrote: >> > >> >> I'm confused by commit >> >> >> >> >> https://git-wip-us.apache.org/repos/asf?p=incubator-cordova-android.git;a=commit;h=7bf35e9c83ca9621b761f887103b79b22e024f8d >> >> There are significant differences between cordova.android.js generated >> by >> >> cordova-js and this file. Any idea why they are out of sync? >> >> >>
