cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Kim <timki...@gmail.com>
Subject Re: Re-tag Cordova Js?
Date Sat, 20 Apr 2013 00:37:41 GMT
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

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message