Return-Path: X-Original-To: apmail-incubator-callback-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E4D2C272 for ; Tue, 15 May 2012 04:58:53 +0000 (UTC) Received: (qmail 15125 invoked by uid 500); 15 May 2012 04:58:53 -0000 Delivered-To: apmail-incubator-callback-dev-archive@incubator.apache.org Received: (qmail 14746 invoked by uid 500); 15 May 2012 04:58:52 -0000 Mailing-List: contact callback-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-dev@incubator.apache.org Received: (qmail 14131 invoked by uid 99); 15 May 2012 04:58:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2012 04:58:52 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of bowserj@gmail.com designates 209.85.212.171 as permitted sender) Received: from [209.85.212.171] (HELO mail-wi0-f171.google.com) (209.85.212.171) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2012 04:58:47 +0000 Received: by wibhm14 with SMTP id hm14so3307879wib.0 for ; Mon, 14 May 2012 21:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=ii3waJM8EuwL9wDHES/wU4CV6srHHxSs/RwG69mARgo=; b=SKtgMFGySbhn4WMXTd2s110fp7f1455K0HesfGi/bHuVHxnwS2/xmz0RY7FqJr33CX n52PUhUEKe3gmE7Z1p9qr0BlUY95exZ7k4Ls6bkl8bShq978qGwWP17AltQj9nvXQfSN 3aSTfWP7fhjwGTZHkmkczO/7piTv9c7ostWwBiZMYFUXQzwLYfbRHwEEr9kMeXDbKgkP 2BOZUbhSdLZOqDKU+z0MmJmH5N+aredG69b3Y+snZXKG2G6VLSSJKkOHi0zQpjeYnJJl sRWM1RSRQw0Vd7AbuycD0F3rddaXzxBRblvf2gQNgUhPjmyxBFJWmSPgEpmS9MXWqTgA vzqw== MIME-Version: 1.0 Received: by 10.180.79.72 with SMTP id h8mr26507814wix.1.1337057905627; Mon, 14 May 2012 21:58:25 -0700 (PDT) Received: by 10.223.47.135 with HTTP; Mon, 14 May 2012 21:58:25 -0700 (PDT) In-Reply-To: References: Date: Mon, 14 May 2012 21:58:25 -0700 Message-ID: Subject: Re: Obligatory Vacation Notice From: Joe Bowser To: callback-dev@incubator.apache.org Content-Type: multipart/alternative; boundary=f46d0442827a82530b04c00c0d8d X-Virus-Checked: Checked by ClamAV on apache.org --f46d0442827a82530b04c00c0d8d Content-Type: text/plain; charset=ISO-8859-1 I think we have a different idea of what merge nightmare is, since it didn't look that bad. That being said, there's a lot of code that was changed to the old pre-cordova-js way of doing things. Are you sure your repo is up to date with the master? I've been doing merge commits on the CordovaWebView branch the whole time, so there shouldn't be a huge difference between master and the branch. Also, I'm seeing stuff in your tree that I haven't seen since before the cordovajs change. Fil, can you look at the diffs and make sure that I'm not just seeing things? Finally, can we please decide on a format? Are we using tabs or spaces in Java files, and how many spaces. I thought we settled this a while ago with spaces, but I'm not sure, and these commits look weird. I'm certain that I'm doing something different than other people again with my "Death to Tabs" kick. On Mon, May 14, 2012 at 9:41 PM, Bryce Curtis wrote: > I've pushed changes to CordovaWebView branch. Hopefully I didn't mess > things up too bad, but merge was messy. > > On Mon, May 14, 2012 at 3:41 PM, Simon MacDonald > wrote: > > Just wanted to make sure. I'll do the call before heading over the > > conference. > > > > Simon Mac Donald > > http://hi.im/simonmacdonald > > > > > > On Mon, May 14, 2012 at 4:37 PM, Joe Bowser wrote: > > > >> I'm cool with a 9 AM call this once. I don't really sleep anymore > anyway. > >> :P > >> > >> On Mon, May 14, 2012 at 1:33 PM, Simon MacDonald > >> wrote: > >> > >> > Just double checking, we are doing the call at 9am pacific time on > >> Tuesday? > >> > > >> > Simon Mac Donald > >> > http://hi.im/simonmacdonald > >> > > >> > > >> > On Mon, May 14, 2012 at 1:09 PM, Joe Bowser > wrote: > >> > > >> > > Hey > >> > > > >> > > Here's the number for the call: (855) 870-5454 > >> > > > >> > > Conference Code is: 5328695080 > >> > > > >> > > If you want, we can set up a Connect room and we can walk through > all > >> the > >> > > code, or we can just talk about it from a High Level. I really > want to > >> > see > >> > > this get in 1.8. That being said, any commits that are done to the > >> > branch > >> > > now are welcome, which is why I put it in on the Apache repository, > and > >> > we > >> > > should probably use the list to talk about it as well as the call. > >> > > > >> > > Joe > >> > > > >> > > > >> > > On Mon, May 14, 2012 at 9:43 AM, Filip Maj wrote: > >> > > > >> > > > Sounds good to me. Joe will setup call details. > >> > > > > >> > > > On 5/14/12 9:02 AM, "Bryce Curtis" > wrote: > >> > > > > >> > > > >How about tomorrow at 9pt/11ct? Simon is traveling today. > >> > > > > > >> > > > >On Mon, May 14, 2012 at 10:56 AM, Filip Maj > wrote: > >> > > > >> Let's have a call ASAP to discuss the issues. > >> > > > >> > >> > > > >> On 5/13/12 9:09 PM, "Bryce Curtis" > >> wrote: > >> > > > >> > >> > > > >>>Joe, > >> > > > >>> > >> > > > >>>I've gone through the CordovaWebView branch with Simon and have > >> some > >> > > > >>>comments and updates based upon your branch for your review. > >> When I > >> > > > >>>upload, I will let you know the link to look at. If you want, > we > >> > can > >> > > > >>>have a call on Tue to go over. There's still some things to be > >> > worked > >> > > > >>>out, so I don't want to rush merging into master until the same > >> > level > >> > > > >>>of function/robustness has been demonstrated. We can make an > >> > > > >>>assessment when you get back. > >> > > > >>> > >> > > > >>>Bryce > >> > > > >>> > >> > > > >>>On Fri, May 11, 2012 at 12:55 PM, Joe Bowser < > bowserj@gmail.com> > >> > > wrote: > >> > > > >>>> Hey > >> > > > >>>> > >> > > > >>>> This will probably make things trickier as far as > CordovaWebView > >> > is > >> > > > >>>> concerned, but I will be away from my keyboard from May 17th > to > >> > May > >> > > > >>>>23rd. > >> > > > >>>> I'll still be reachable via e-mail, but I won't be able to > do > >> > much > >> > > > >>>>more > >> > > > >>>> than that for that time. > >> > > > >>>> > >> > > > >>>> Joe > >> > > > >> > >> > > > > >> > > > > >> > > > >> > > >> > --f46d0442827a82530b04c00c0d8d--