Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cordova.apache.org
Received-SPF: pass (nike.apache.org: domain of mmocny@google.com designates
 209.85.214.49 as permitted sender)
MIME-Version: 1.0
Sender: mmocny@google.com
In-Reply-To: 
 <CAKP6k2v-u=NunL=u9yUZRP0puEr7Y5G0T2fUZNBOEZwuNYPaCw@mail.gmail.com>
References: 
 <CACuXHJNCwseVE52WWS7s+96GQ+=TvNXtFscuNUjDjqsXyND+8w@mail.gmail.com>
 <CD970315.1D521%fil@adobe.com>
 <CACuXHJN10wHnC-jNPeyWdu6y4GV6gUNC+rnvUfKqUT6c=cvRHA@mail.gmail.com>
 <CAE6O_-a=05KT+syNuMC-+ccs1ajoyXK0Mg+7nTe7D1Tz4-eZoA@mail.gmail.com>
 <CACuXHJOnLWz6nv+-QEuAQCTDNAU7YtOcsLYGt3Wx4PHL3+GdfQ@mail.gmail.com>
 <CAE6O_-ZSEG6KSLc-885smsk6au8Zq8m_obijm0z1oHTqaNSf9w@mail.gmail.com>
 <CACuXHJNiFZZngCW9-2hhty40SOFLKFu_AgutdLE4D3OQXXeq4w@mail.gmail.com>
 <CAE6O_-b6bwFP74QN10WGy2RHhORzo+rO5=o8NxDESB+48VUiNQ@mail.gmail.com>
 <CACuXHJNQ6raaE4JF1XehNBrK1_4npzTnmePdV-GbYhGTEJjaWw@mail.gmail.com>
 <CAKP6k2vLDpx_vnO7fSN=-T4xROxAbyk0mbzXj=kwpF0OwxT0rA@mail.gmail.com>
 <CAE6O_-Y4Tpqth2GSobTZZU2-NOhkwGbthtySR8+X4hp==LO7Ag@mail.gmail.com>
 <CAKP6k2sBLo898Vk-rwOR7uv_M2YxFa871jtNjyLYPQvmiSDCTQ@mail.gmail.com>
 <CACuXHJOABMhB1uT2WD3zXMM2rSAYN+f0bM5dx=qC-2wkHKGQ2w@mail.gmail.com>
 <CACuXHJM0mypxkGiMhY6canr1hX6cqM3xP6S2X9z6TOcswqZWCg@mail.gmail.com>
 <CAOBL_k6=wnPNL4Qc0aeFh3DQaej5YvNXvUCvQxwao0f_fXF+Xg@mail.gmail.com>
 <CAKP6k2smWkwatyRhbP5ZAupqw=EiViCOcsqbb+9tcKJcUyK9vg@mail.gmail.com>
 <CAOBL_k4q=QNezzqOexP0fLvoXMk3w3k10cyKLNndMkuhcaQLiw@mail.gmail.com>
 <CAKP6k2v-u=NunL=u9yUZRP0puEr7Y5G0T2fUZNBOEZwuNYPaCw@mail.gmail.com>
From: Michal Mocny <mmocny@chromium.org>
Date: Sun, 21 Apr 2013 11:58:51 -0400
Message-ID: 
 <CAEeF2TfdO8XVsS-2dEkZDfSUz0J=+BizpO+ihHbkUhxPG46hnA@mail.gmail.com>
Subject: Re: Re-tag Cordova Js?
To: dev <dev@cordova.apache.org>
Content-Type: multipart/alternative; boundary=f46d041c447a799dae04dae108e0

--f46d041c447a799dae04dae108e0
Content-Type: text/plain; charset=ISO-8859-1

I thought we decided to leave the VERSION in master branch as a constant
EDGE or something like that?


On Fri, Apr 19, 2013 at 9:01 PM, Jesse <purplecabbage@gmail.com> wrote:

> continuous instigation?
>
> @purplecabbage
> risingj.com
>
>
> On Fri, Apr 19, 2013 at 5:57 PM, Joe Bowser <bowserj@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 <purplecabbage@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 <bowserj@gmail.com> wrote:
> > >
> > >> Getting merge conflicts! Seriously, WTF?
> > >>
> > >> On Fri, Apr 19, 2013 at 5:44 PM, Tim Kim <timkim85@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 <timkim85@gmail.com> wrote:
> > >> >
> > >> >> Ya...I just realised. Arghhhh.
> > >> >>
> > >> >>
> > >> >> On 19 April 2013 17:35, Jesse <purplecabbage@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 <shazron@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 <purplecabbage@gmail.com
> >
> > >> wrote:
> > >> >>> >
> > >> >>> > > Hurry! It's Friday.
> > >> >>> > >
> > >> >>> > > @purplecabbage
> > >> >>> > > risingj.com
> > >> >>> > >
> > >> >>> > >
> > >> >>> > > On Fri, Apr 19, 2013 at 5:19 PM, Tim Kim <timkim85@gmail.com>
> > >> wrote:
> > >> >>> > >
> > >> >>> > > > NOOOOOOO
> > >> >>> > > >
> > >> >>> > > >
> > >> >>> > > > On 19 April 2013 17:15, Shazron <shazron@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 <
> > timkim85@gmail.com>
> > >> >>> wrote:
> > >> >>> > > > >
> > >> >>> > > > > > Ok, it should be good to go now.
> > >> >>> > > > > >
> > >> >>> > > > > >
> > >> >>> > > > > > On 19 April 2013 16:59, Shazron <shazron@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 <
> > >> timkim85@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 <shazron@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 <
> > >> >>> timkim85@gmail.com
> > >> >>> > >
> > >> >>> > > > > wrote:
> > >> >>> > > > > > > > >
> > >> >>> > > > > > > > > > Done and done.
> > >> >>> > > > > > > > > >
> > >> >>> > > > > > > > > >
> > >> >>> > > > > > > > > > On 19 April 2013 14:21, Filip Maj <
> fil@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" <
> > timkim85@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
> > >>
> >
>

--f46d041c447a799dae04dae108e0--