continuous instigation? @purplecabbage risingj.com
On Fri, Apr 19, 2013 at 5:57 PM, Joe Bowser <bows...@gmail.com> wrote: > I've re-tagged Android with the new JS. > > WORST RELEASE PROCESS EVER! > > On Fri, Apr 19, 2013 at 5:54 PM, Jesse <purplecabb...@gmail.com> wrote: > > Okay, so are we good with 360bd3e65c33ce4f01e2efb82d641a565ef3c333 ? > > I have tagged WP7+8 > > > > @purplecabbage > > risingj.com > > > > > > On Fri, Apr 19, 2013 at 5:50 PM, Joe Bowser <bows...@gmail.com> wrote: > > > >> Getting merge conflicts! Seriously, WTF? > >> > >> On Fri, Apr 19, 2013 at 5:44 PM, Tim Kim <timki...@gmail.com> wrote: > >> > Oh turns out I just didn't push up the 2.7.x changes :) > >> > > >> > Thought something crazier was going on. OK - I think it should be good > >> now! > >> > > >> > *crosses fingers* > >> > > >> > > >> > > >> > On 19 April 2013 17:37, Tim Kim <timki...@gmail.com> wrote: > >> > > >> >> Ya...I just realised. Arghhhh. > >> >> > >> >> > >> >> On 19 April 2013 17:35, Jesse <purplecabb...@gmail.com> wrote: > >> >> > >> >>> rc1 tag is on master but not the 2.7.x branch > >> >>> > >> >>> > >> >>> @purplecabbage > >> >>> risingj.com > >> >>> > >> >>> > >> >>> On Fri, Apr 19, 2013 at 5:27 PM, Shazron <shaz...@gmail.com> wrote: > >> >>> > >> >>> > Hey it's no so bad, just find the chevrons and pick the right > >> section. > >> >>> If > >> >>> > you gtg I can take care of it > >> >>> > > >> >>> > > >> >>> > On Fri, Apr 19, 2013 at 5:24 PM, Jesse <purplecabb...@gmail.com> > >> wrote: > >> >>> > > >> >>> > > Hurry! It's Friday. > >> >>> > > > >> >>> > > @purplecabbage > >> >>> > > risingj.com > >> >>> > > > >> >>> > > > >> >>> > > On Fri, Apr 19, 2013 at 5:19 PM, Tim Kim <timki...@gmail.com> > >> wrote: > >> >>> > > > >> >>> > > > NOOOOOOO > >> >>> > > > > >> >>> > > > > >> >>> > > > On 19 April 2013 17:15, Shazron <shaz...@gmail.com> wrote: > >> >>> > > > > >> >>> > > > > You checked in merge conflicts. e.g. > >> >>> > > > > > >> >>> > > > > +<<<<<<< HEAD > >> >>> > > > > 2.5.0 > >> >>> > > > > +======= > >> >>> > > > > +2.7.0rc1 > >> >>> > > > > +>>>>>>> > >> >>> > > > > > >> >>> > > > > > >> >>> > > > > On Fri, Apr 19, 2013 at 5:14 PM, Tim Kim < > timki...@gmail.com> > >> >>> wrote: > >> >>> > > > > > >> >>> > > > > > Ok, it should be good to go now. > >> >>> > > > > > > >> >>> > > > > > > >> >>> > > > > > On 19 April 2013 16:59, Shazron <shaz...@gmail.com> > wrote: > >> >>> > > > > > > >> >>> > > > > > > Can you commit them to the two branches from your > local? If > >> >>> not > >> >>> > > when > >> >>> > > > we > >> >>> > > > > > > generate the js off the branches it's not correct > >> >>> > > > > > > > >> >>> > > > > > > > >> >>> > > > > > > On Fri, Apr 19, 2013 at 4:57 PM, Tim Kim < > >> timki...@gmail.com> > >> >>> > > wrote: > >> >>> > > > > > > > >> >>> > > > > > > > Ya I couldn't find them either. My guess is that the > "Set > >> >>> > VERSION > >> >>> > > > to > >> >>> > > > > > > 2.7.0" > >> >>> > > > > > > > commit was in a detached head state when pushed to the > >> >>> repo. I > >> >>> > > > wasn't > >> >>> > > > > > too > >> >>> > > > > > > > sure what was going on, so I decided to go with the > flow. > >> >>> > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > On 19 April 2013 16:46, Shazron <shaz...@gmail.com> > >> wrote: > >> >>> > > > > > > > > >> >>> > > > > > > > > Looking at cordova-js: > >> >>> > > > > > > > > > >> >>> > > > > >> https://git-wip-us.apache.org/repos/asf?p=cordova-js.git;a=summary > >> >>> > > > > > > > > > >> >>> > > > > > > > > The 2.7.0rc1 tag, the last two commits: > >> >>> > > > > > > > > > >> >>> > > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > >> >>> > > > > > > >> >>> > > > > > >> >>> > > > > >> >>> > > > >> >>> > > >> >>> > >> > https://git-wip-us.apache.org/repos/asf?p=cordova-js.git;a=log;h=refs/tags/2.7.0rc1 > >> >>> > > > > > > > > 1. Fixed version number > >> >>> > > > > > > > > 2. Set VERSION to 2.7.0 > >> >>> > > > > > > > > > >> >>> > > > > > > > > I can't seem to find these commits in any branch, > not > >> >>> 2.7.x, > >> >>> > > nor > >> >>> > > > > > > master. > >> >>> > > > > > > > > > >> >>> > > > > > > > > Am I going crazy or is there something else going > on? > >> :/ > >> >>> > > > > > > > > > >> >>> > > > > > > > > > >> >>> > > > > > > > > > >> >>> > > > > > > > > On Fri, Apr 19, 2013 at 2:34 PM, Tim Kim < > >> >>> timki...@gmail.com > >> >>> > > > >> >>> > > > > wrote: > >> >>> > > > > > > > > > >> >>> > > > > > > > > > Done and done. > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > On 19 April 2013 14:21, Filip Maj <f...@adobe.com> > >> >>> wrote: > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > > Probably a retag since we use the contents of > >> VERSION > >> >>> to > >> >>> > > > > > > interpolate > >> >>> > > > > > > > > the > >> >>> > > > > > > > > > > framework version string into the JS-only > >> platforms' > >> >>> JS. > >> >>> > > > > > > > > > > > >> >>> > > > > > > > > > > On 4/19/13 2:16 PM, "Tim Kim" < > timki...@gmail.com> > >> >>> > wrote: > >> >>> > > > > > > > > > > > >> >>> > > > > > > > > > > >Hey gang, > >> >>> > > > > > > > > > > > > >> >>> > > > > > > > > > > >I noticed that the 2.7.0rc1 tag commit for > >> Cordova JS > >> >>> > sets > >> >>> > > > the > >> >>> > > > > > > > version > >> >>> > > > > > > > > > to > >> >>> > > > > > > > > > > >just 2.7.0: > >> >>> > > > > > > > > > > > > >> >>> > > > > > > > > > > > > >> >>> > > > > > > > > > > > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > >> >>> > > > > > > >> >>> > > > > > >> >>> > > > > >> >>> > > > >> >>> > > >> >>> > >> > https://git-wip-us.apache.org/repos/asf?p=cordova-js.git;a=commit;h=d0ffb8 > >> >>> > > > > > > > > > > >52378ff018bac2f3b12c38098a19b8ce00 > >> >>> > > > > > > > > > > > > >> >>> > > > > > > > > > > >Small thing really - should we just force a > retag > >> or > >> >>> do > >> >>> > > > > > something > >> >>> > > > > > > > > else? > >> >>> > > > > > > > > > > > > >> >>> > > > > > > > > > > > > >> >>> > > > > > > > > > > >-- > >> >>> > > > > > > > > > > >Timothy Kim > >> >>> > > > > > > > > > > > >> >>> > > > > > > > > > > > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > -- > >> >>> > > > > > > > > > Timothy Kim > >> >>> > > > > > > > > > > >> >>> > > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > > >> >>> > > > > > > > -- > >> >>> > > > > > > > Timothy Kim > >> >>> > > > > > > > > >> >>> > > > > > > > >> >>> > > > > > > >> >>> > > > > > > >> >>> > > > > > > >> >>> > > > > > -- > >> >>> > > > > > Timothy Kim > >> >>> > > > > > > >> >>> > > > > > >> >>> > > > > >> >>> > > > > >> >>> > > > > >> >>> > > > -- > >> >>> > > > Timothy Kim > >> >>> > > > > >> >>> > > > >> >>> > > >> >>> > >> >> > >> >> > >> >> > >> >> -- > >> >> Timothy Kim > >> >> > >> >> > >> > > >> > > >> > -- > >> > Timothy Kim > >> >
