[openstack-dev] [Keystone] Questions about git heirarchy

Gabriel Hurley Gabriel.Hurley at nebula.com
Tue Sep 4 23:40:45 UTC 2012


I can't speak for keystoneclient's existing strategy, but in the more general sense I've always favored a branching/tagging strategy that had an ongoing for each release, and then tagged point releases:

2011.2.x [branch]
2011.2 [tag]
2011.2.1 [tag]
2011.2.2 [tag]

2011.3.x [branch]
2011.3 [tag]
2011.3.1 [tag]

2012.1.x [branch]
2012.1 [tag]
2012.1.1 [tag]
2012.1.2 [tag]

That way it's always clear which is the "trunk" for a release series if you want all the latest backported changes and also clear which tag is the most recent... and if any project, client, etc. chooses to follow a release versioning scheme that doesn't sort correctly in PyPI then heaven help them. (PEP386 for anyone interested: http://www.python.org/dev/peps/pep-0386/ )


-          Gabriel

From: Matt Joyce [mailto:matt.joyce at cloudscaling.com]
Sent: Tuesday, September 04, 2012 4:01 PM
To: OpenStack Development Mailing List
Subject: [openstack-dev] [Keystone] Questions about git heirarchy

So I noticed a few things today.  Just want to clarify if I am right about this.  And maybe I am and if so... questions to follow.

First off... simply put doing a git tag on the keystone git repot ( github.com/openstack/keystone/<http://github.com/openstack/keystone/> ) I get a set of tags.

matt at cloudcrusher:~/OPENSTACK/keystone$ git tag
2011.3
2011.3.1
2012.1
2012.1.1
2012.1.2
essex-1
essex-2
essex-3
essex-4
essex-rc1
essex-rc2
folsom-1
folsom-2
folsom-3

Hassah.  Tags.  Then I go hop onto the repot for python-keystoneclient ( github.com/openstack/python-keystoneclient<http://github.com/openstack/python-keystoneclient> ) and run git tag.

matt at cloudcrusher:~/OPENSTACK/python-keystoneclient$ git tag
0.1.0
0.1.1
2012.1
essex-3
essex-4
essex-rc1
essex-rc2
folsom-1

That's pretty neat.  Less tags.  In fact, less recent tags.  So we have a tag for 2012.1 in python-keystoneclient as the latest tag for essex.  Great except the latest tag for keystone is 2012.1.2 ( latest in essex )

In and of itself... FINE.  Keystone 2012.1.2 is probably fully compatible with client 2012.1 .  Would love to see that with a bit more certainty.  But hey I'm easy.

Here's my next issue.  And it's related and maybe bad.

When I do a checkout of 2012.1.2 in keystone AND when i do a git log, the latest commit is Aug 8.  None of the OSSA patches are seemingly included.

So, I have a few questions.

How do people know which git ref to pull to get all of the latest fixes?

How do people know which corresponding git refs in other projects they should pull to ensure they have the latest compatible and tested ( ???? ) refs?

-Matt

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20120904/e0c77881/attachment.html>


More information about the OpenStack-dev mailing list