Discussion:
[GNC] Manint Brach on GitHub
Stephen M. Butler
2018-12-06 00:59:37 UTC
Permalink
John,

Is the maint branch (3.3-153) the official 3.3 release?

I see that master branch is at 3.3-159.  I presume that is the current
work for 3.4.

--Steve
--
Stephen M Butler, PMP, PSM
***@gmail.com
***@arrl.net
253-350-0166
-------------------------------------------
GnuPG Fingerprint: 8A25 9726 D439 758D D846 E5D4 282A 5477 0385 81D8

_______________________________________________
gnucash-user mailing list
gnucash-***@gnucash.org
To update your subscription preferences or to unsubscribe:
https://lists.gnucash.org/mailman/listinfo/gnucash-user
If you are using Nabble or Gmane, please see https://wiki.gnucash.org/wiki/Mailing_Lists for more information.
-----
Please remember to CC this list on all your replies.
You can do this by using Reply-To-List or Reply-Al
John Ralls
2018-12-06 02:17:53 UTC
Permalink
Post by Stephen M. Butler
John,
Is the maint branch (3.3-153) the official 3.3 release?
I see that master branch is at 3.3-159. I presume that is the current work for 3.4.
No, 3.3 is the official 3.3 release. 3.3-153 would be 153 commits after the 3.3 tag. Maint and master are actually at the same level, I just merged maint->master a couple of days ago and I don’t think there have been any commits since. The difference in the release counts is because of the merge commits on master.

We release the stable branch off of maint; master is for development leading to 4.0. We just haven’t had time to do any development for 4.0 yet because we’ve been too busy getting 3.x settled down.

Regards,
John Ralls

_______________________________________________
gnucash-user mailing list
gnucash-***@gnucash.org
To update your subscription preferences or to unsubscribe:
https://lists.gnucash.org/mailman/listinfo/gnucash-user
If you are using Nabble or Gmane, please see https://wiki.gnucash.org/wiki/Mailing_Lists for more information.
-----
Please remember to CC this list on all your replies.
You can do this by using Reply-To
stephen.m.butler51
2018-12-06 02:48:22 UTC
Permalink
I'll see if I can grab the 3.3 branch.


Sent from my Verizon, Samsung Galaxy smartphone
Post by Stephen M. Butler
John,
Is the maint branch (3.3-153) the official 3.3 release?
I see that master branch is at 3.3-159.  I presume that is the current work for 3.4.
No, 3.3 is the official 3.3 release. 3.3-153 would be 153 commits after the 3.3 tag. Maint and master are actually at the same level, I just merged maint->master a couple of days ago and I don’t think there have been any commits since. The difference in the release counts is because of the merge commits on master.

We release the stable branch off of maint; master is for development leading to 4.0. We just haven’t had time to do any development for 4.0 yet because we’ve been too busy getting 3.x settled down.

Regards,
John Ralls

_______________________________________________
gnucash-user mailing list
gnucash-***@gnucash.org
To update your subscription preferences or to unsubscribe:
https://lists.gnucash.org/mailman/listinfo/gnucash-user
If you are using Nabble or Gmane, please see https://wiki.gnucash.org/wiki/Mailing_Lists for more information.
-----
Please remember to CC this list on all your replies.
You can do this by using Reply-To-List or Re
Geert Janssens
2018-12-06 07:55:01 UTC
Permalink
Post by stephen.m.butler51
I'll see if I can grab the 3.3 branch.
I understand what you want to say here, however it occurs to me there's still
some confusion on how git works. So I'll take the liberty to elaborate a bit
on that. There is no 3.3 "branch". Releases are "tagged" instead so there will
be a 3.3 tag you can check out.

A "branch" is a moving target that always points at last commit of a chain of
commits. You can add new commits to this chain, which will move the branch to
the new last commit of that chain.

A tag on the other hand is used to mark very specific commits which are not
necessarily the last one in a chain. As releases are fixed moments in time, it
makes sense to use tags to mark releases. And branches on the other hand track
ongoing work (either maintenance work on the "maint" branch or new development
work on the "master" branch or even intermediate work on feature branches,
though these are used only in user's personal repository clones).

Regards,

Geert


_______________________________________________
gnucash-user mailing list
gnucash-***@gnucash.org
To update your subscription preferences or to unsubscribe:
https://lists.gnucash.org/mailman/listinfo/gnucash-user
If you are using Nabble or Gmane, please see https://wiki.gnucash.org/wiki/Mailing_Lists for more information.
-----
Please remember to CC this list on all your replies.
You can do this by using Reply-To-List or Reply-All.
Stephen M. Butler
2018-12-06 17:41:46 UTC
Permalink
Post by Geert Janssens
Post by stephen.m.butler51
I'll see if I can grab the 3.3 branch.
I understand what you want to say here, however it occurs to me there's still
some confusion on how git works. So I'll take the liberty to elaborate a bit
on that. There is no 3.3 "branch". Releases are "tagged" instead so there will
be a 3.3 tag you can check out.
A "branch" is a moving target that always points at last commit of a chain of
commits. You can add new commits to this chain, which will move the branch to
the new last commit of that chain.
A tag on the other hand is used to mark very specific commits which are not
necessarily the last one in a chain. As releases are fixed moments in time, it
makes sense to use tags to mark releases. And branches on the other hand track
ongoing work (either maintenance work on the "maint" branch or new development
work on the "master" branch or even intermediate work on feature branches,
though these are used only in user's personal repository clones).
Regards,
Geert
Thanks for the elaboration.  As you noted, I'm new to git and still
figuring things out.  Right now I'm at the end of a fire hose and
drowning in Scheme, C++, git, etc.  Not to mention the 60 hours of web
seminars I need to pick up to keep my PMP certification (at least I have
18 months to do that).

I did dig around last night and figured out that even though I could
checkout 3.3, it wasn't a branch.  Finally found the things called
tag(s) and figured something close to what you elaborated.

Thanks for being patient with me.  And I do have a .deb file for v3.3
now if anyone it interested in seeing if it will work for them.

Feel free to keep nudging me in the right direction.  I'd hate to end up
in a quagmire of my own making!
--
Stephen M Butler, PMP, PSM
***@gmail.com
***@arrl.net
253-350-0166
-------------------------------------------
GnuPG Fingerprint: 8A25 9726 D439 758D D846 E5D4 282A 5477 0385 81D8

_______________________________________________
gnucash-user mailing list
gnucash-***@gnucash.org
To update your subscription preferences or to unsubscribe:
https://lists.gnucash.org/mailman/listinfo/gnucash-user
If you are using Nabble or Gmane, please see https://wiki.gnucash.org/wiki/Mailing_Lists for more information.
-----
Please remember to CC this list on all your replies.
You can do this by using Reply-To-List or Re
Loading...