Confused About Versioning and Upgrading

[Drew]

Hey Guys,

I've been using gitorious happily for a while now, you guys have done
a great job, it's just I'm confused about the new versioning scheme.

This is what I usually do. I have a branch called my_config that I
have pushed my changes in there. Now every now and then I do a git
pull and get the latest from git://gitorious.org/gitorious/mainline.git.
Some times gitorious comes up with no complains and some times I have
to either install new gems or run "rake db:migrate"

Based on http://gitorious.org/gitorious/pages/Upgrading and
http://gitorious.org/gitorious/pages/Versioning seems like I need to
run "bundle exec rake changelog" to see the versions. I just ran that
and I got:
Available versions
-> v2.0.0 First versioned version of Gitorious

But I did a "git pull" and that downloaded bunch of changes (which
broke gitorious, but I fixed it by installing new gems)
I ran "bundle exec rake changelog" again, but the output is the same.

So my question is, how does "bundle exec rake changelog" work? If the
version hasn't changed, then what were all those changes that were
downloaded?

Thanks,

Drew

[Marius Mårnes Mathiesen]

On Sat, Jul 30, 2011 at 3:54 AM, Drew <dr...@venarc.com> wrote:

This is what I usually do. I have a branch called my_config that I
have pushed my changes in there. Now every now and then I do a git
pull and get the latest from git://gitorious.org/gitorious/mainline.git.
Some times gitorious comes up with no complains and some times I have
to either install new gems or run "rake db:migrate"

 The bundle install or rake migrate steps are two of the reasons why we went for versioning Gitorious. A patch version should not require:

- rake db:migrate

- bundle install

Minor versions could require you to do so. So a rule of thumb would be to upgrade patch versions simply by using git pull, upgrading to a new minor version you should always both migrate and install gems, since that may be required.

 

But I did a "git pull" and that downloaded bunch of changes (which
broke gitorious, but I fixed it by installing new gems)
I ran "bundle exec rake changelog" again, but the output is the same.

If you did a git pull while on the master branch, that will have been updated. Our versioning scheme is based on using git tags to check out a specific version. 

 

So my question is, how does "bundle exec rake changelog" work? If the
version hasn't changed, then what were all those changes that were
downloaded?

It will compare the available tags on the server to the current tag you're running with. 

Cheers,

- Marius

[Drew]

When I run git tag, I get:
20110110-1
loba-loba
v2.0.0

Seems like the only version tag you guys have is v2.0.0 on
git://gitorious.org/gitorious/mainline.git
So you guys are not following the versioning scheme yet? How can there
not be other versions but code changes?


Thanks,

Drew




On Aug 1, 12:20 am, Marius Mårnes Mathiesen
<marius.mathie...@gmail.com> wrote:

[Marius Mårnes Mathiesen]

On Tue, Aug 2, 2011 at 12:12 AM, Drew <dr...@venarc.com> wrote:

When I run git tag, I get:
20110110-1
loba-loba
v2.0.0

Seems like the only version tag you guys have is v2.0.0 on

git://gitorious.org/gitorious/mainline.git

So you guys are not following the versioning scheme yet? How can there
not be other versions but code changes?

We haven't deployed any changes since 2.0.0, too busy enjoying summer :-)

- Marius

[Drew]

That makes sense now. But you guys have been pushing code to mainline
and not updating the tags. That's not good.


On Aug 1, 11:50 pm, Marius Mårnes Mathiesen
<marius.mathie...@gmail.com> wrote:

[Benjamin Podszun]

I fail to understand your point.
The team decided to use master as development branch. If you want stable versions, stick with tags. In other words: Development moved on, but nothing was tagged as new version (be it a minor step forward or a major) yet.

--
To post to this group, send email to gito...@googlegroups.com
To unsubscribe from this group, send email to
gitorious+...@googlegroups.com

[Christian Johansen]

Thank you Benjamin. This is correct: we will continue to actively develop Gitorious on master, and we will try to keep it stable as before. However, the tags will receive more testing, and in general should be more reliable as a mechanism to upgrade local installs. So, master should be considered "Gitorious beta" (generally stable, may have occasional issues, incomplete features a.s.o), while tags provide stable releases.

Christian

--
MVH
Christian

[Brenda Wallace]

Thanks - that was useful to know and thus I've copied it to here:
https://gitorious.org/gitorious/pages/Installation

Also moved that "DISCONTINUED TODO" to the bottom of the page so it no longer appears to be a comment on the entire page.

[Drew]

This makes sense now. I thought master would have only been used for
"releases". Basically merging dev into the release with a tag. I
missed the part that you guys are doing active development on the
master.

So the safe approach would be not to pull from the master unless
there's a new tag. Correct?

On Aug 8, 2:09 pm, Brenda Wallace <bren...@wetafx.co.nz> wrote:
> Thanks - that was useful to know and thus I've copied it to here:https://gitorious.org/gitorious/pages/Installation
>
> Also moved that "DISCONTINUED TODO" to the bottom of the page so it no
> longer appears to be a comment on the entire page.
>
> On 09/08/11 01:46, Christian Johansen wrote:
>
>
>
>
>
>
>
> > Thank you Benjamin. This is correct: we will continue to actively
> > develop Gitorious on master, and we will try to keep it stable as
> > before. However, the tags will receive more testing, and in general
> > should be more reliable as a mechanism to upgrade local installs. So,
> > master should be considered "Gitorious beta" (generally stable, may
> > have occasional issues, incomplete features a.s.o), while tags provide
> > stable releases.
>
> > Christian
>
> > On Tue, Aug 2, 2011 at 20:35, Benjamin Podszun
> > <benjamin.pods...@gmail.com <mailto:benjamin.pods...@gmail.com>> wrote:
>
> >     I fail to understand your point.
> >     The team decided to use master as development branch. If you want
> >     stable versions, stick with tags. In other words: Development
> >     moved on, but nothing was tagged as new version (be it a minor
> >     step forward or a major) yet.
>

> >     On Tue, Aug 2, 2011 at 9:21 PM, Drew <d...@venarc.com

> >     <mailto:d...@venarc.com>> wrote:
>
> >         That makes sense now. But you guys have been pushing code to
> >         mainline
> >         and not updating the tags. That's not good.
>

> >         On Aug 1, 11:50 pm, Marius M�rnes Mathiesen
> >         <marius.mathie...@gmail.com

> >         <mailto:marius.mathie...@gmail.com>> wrote:
> >         > On Tue, Aug 2, 2011 at 12:12 AM, Drew <d...@venarc.com

> >         <mailto:d...@venarc.com>> wrote:
> >         > > When I run git tag, I get:
> >         > > 20110110-1
> >         > > loba-loba
> >         > > v2.0.0
>
> >         > > Seems like the only version tag you guys have is v2.0.0 on
> >         > > git://gitorious.org/gitorious/mainline.git

> >         <http://gitorious.org/gitorious/mainline.git>

> >         > > So you guys are not following the versioning scheme yet?
> >         How can there
> >         > > not be other versions but code changes?
>
> >         > We haven't deployed any changes since 2.0.0, too busy
> >         enjoying summer :-)
>
> >         > - Marius
>
> >         --
> >         To post to this group, send email to

> >         gito...@googlegroups.com <mailto:gito...@googlegroups.com>

> >         To unsubscribe from this group, send email to
> >         gitorious+...@googlegroups.com

> >         <mailto:gitorious%2Bunsu...@googlegroups.com>

>
> >     --
> >     To post to this group, send email to gito...@googlegroups.com

> >     <mailto:gito...@googlegroups.com>

> >     To unsubscribe from this group, send email to
> >     gitorious+...@googlegroups.com

> >     <mailto:gitorious%2Bunsu...@googlegroups.com>

[Marius Mårnes Mathiesen]

On Wed, Aug 10, 2011 at 8:24 PM, Drew <dr...@venarc.com> wrote:

So the safe approach would be not to pull from the master unless
there's a new tag. Correct?

I suppose it depends what you understand by safe, but the answer is probably yes. Whenever we create a tag, it signifies that a piece of functionality has been added. And based on what you'll need to do to upgrade, we'll be using either patch, minor or major versions.

If you want to run from master, you'll have to determine whether you need to:

- run bundle install

- run rake db:migrate

- remove cached javascripts/css

every time you pull. Sticking to tagged versions means you don't have to.

Cheers,

- Marius