Release version in Git.

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

Release version in Git.

Raymond Martin
This may be a rookie question, but with the current release at v3.1.3 why I am I seeing this as only a tag and not master (which is at v3.1.2-72-g4d89eab)
on my side?

Am I doing something wrong?
Reply | Threaded
Open this post in threaded view
|

Re: Release version in Git.

Robby Stephenson
On Fri, Sep 14, 2018 at 10:23 AM Raymond Martin <[hidden email]> wrote:
This may be a rookie question, but with the current release at v3.1.3 why I am I seeing this as only a tag and not master (which is at v3.1.2-72-g4d89eab)
on my side?

Sounds like you're using a package from your distribution? It may be just that they haven't updated it yet. 

Robby 
Reply | Threaded
Open this post in threaded view
|

Re: Release version in Git.

Robby Stephenson
On Mon, Sep 17, 2018 at 6:21 AM Raymond Martin <[hidden email]> wrote:
>
> I am directly using git to pull from the repository.

I don't think I understand your question then. There's a 3.1 branch
with a v3.1.3 tag in git. The master branch is where 3.2 will
eventually come from but it's not the stable branch. I'm not sure what
"v3.1.2-72-g4d89eab" refers to. In the 3.1 branch, I usually bump the
internal Tellico version to include "+git" or something along those
lines, but ti doesn't sound like that is what you're referring to.

Robby

> On Fri, Sep 14, 2018 at 3:04 PM, Robby Stephenson <[hidden email]> wrote:
>>
>> On Fri, Sep 14, 2018 at 10:23 AM Raymond Martin <[hidden email]> wrote:
>>>
>>> This may be a rookie question, but with the current release at v3.1.3 why I am I seeing this as only a tag and not master (which is at v3.1.2-72-g4d89eab)
>>> on my side?
>>
>>
>> Sounds like you're using a package from your distribution? It may be just that they haven't updated it yet.
>>
>> Robby
>
>
Reply | Threaded
Open this post in threaded view
|

Re: Release version in Git.

Ian Campbell-2
On Mon, 2018-09-17 at 06:33 -0400, Robby Stephenson wrote:

> On Mon, Sep 17, 2018 at 6:21 AM Raymond Martin <[hidden email]>
> wrote:
> >
> > I am directly using git to pull from the repository.
>
> I don't think I understand your question then. There's a 3.1 branch
> with a v3.1.3 tag in git. The master branch is where 3.2 will
> eventually come from but it's not the stable branch. I'm not sure
> what
> "v3.1.2-72-g4d89eab" refers to. In the 3.1 branch, I usually bump the
> internal Tellico version to include "+git" or something along those
> lines, but ti doesn't sound like that is what you're referring to.

It looks like the output of `git describe 4d89eab` (or just `git
describe` when HEAD is 4d89eab.

Seems like Raymond you need to switch from master to the 3.1 branch if
you want to track the 3.1.x stable series.

If you repo is missing bits (branches not up to date, tags missing etc)
perhaps a `git fetch origin` and/or a `git fetch origin --tags` will
help.

Ian.

Reply | Threaded
Open this post in threaded view
|

Re: Release version in Git.

Ian Campbell-2
You forgot to include the list, I've put it back.

On Mon, 2018-09-17 at 09:30 -0400, Raymond Martin wrote:
> I definitely have the repository up to date. I will try to change
> branches.
>
> It just seemed to me that if a release is made it should be at the
> head and not a separate branch.

The release in question was a _point_ release on a stable branch, not a
full new/major release, that's a very common arrangement for a repo
(and for release management in general).

Ian.


Reply | Threaded
Open this post in threaded view
|

Re: Release version in Git.

sirgeek-tellico
In reply to this post by Robby Stephenson

On 2018-09-14 15:04, Robby Stephenson wrote:

On Fri, Sep 14, 2018 at 10:23 AM Raymond Martin <[hidden email]> wrote:
This may be a rookie question, but with the current release at v3.1.3 why I am I seeing this as only a tag and not master (which is at v3.1.2-72-g4d89eab)
on my side?
 
Sounds like you're using a package from your distribution? It may be just that they haven't updated it yet. 
 
Robby 

I just wish the powers that be at Centos woulod get on the ball and upgrade things.

My big fear is since you've moved to KDE 5, I'm SOL for another year (until KDE 5 is in the main release).

 

Matt

 
Reply | Threaded
Open this post in threaded view
|

Re: Release version in Git.

Robby Stephenson
In reply to this post by Ian Campbell-2


> On Sep 17, 2018, at 07:33, Ian Campbell <[hidden email]> wrote:
>
> You forgot to include the list, I've put it back.
>
>> On Mon, 2018-09-17 at 09:30 -0400, Raymond Martin wrote:
>> I definitely have the repository up to date. I will try to change
>> branches.
>>
>> It just seemed to me that if a release is made it should be at the
>> head and not a separate branch.
>
> The release in question was a _point_ release on a stable branch, not a
> full new/major release, that's a very common arrangement for a repo
> (and for release management in general).

Right. The master branch may break from time to time or get a little stale as I do bug fixes on the stable branch. I merge all those back into master periodically but not quickly.

There’s always a tag for a release, whatever branch it’s on.

Robby