Quantcast

Git poll results, and moving on

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Git poll results, and moving on

geowolf
Hi,
the git poll results pretty much settled down, I'd say the result
is clear enough in favor of a switch to git:
http://micropoll.com/t/LEuWWZIu5J

I guess the next steps would be to take some decisions on timing,
platform, and commit/branch management.

Let me propose something just to get started.

Timing: as soon as possible, no need to wait further

Platform: github, it already hosts the clone successfully, it's
quite popular too, should help potential contributors get started
(btw, does the current clone have the entire history?)

Commits: I'd say all that have commit today to svn would also
have direct commit on the "official" repo, everybody else
does a push request or provides a patch.
For large patches that need a review I guess everybody,
official devs included, do a push?

Branch/tag management. Hum, I see there are some guidances
around, not sure I like them:
http://nvie.com/posts/a-successful-git-branching-model/

I believe the current svn model served us well in terms of release
management and expectations on where to find the code
(master == trunk, tags are tags, the branches are there for
the stable series, feature development is done in each developer
clone though I can also see official branches uses for that)

I also believe we should update the dev guide with some suggestions
on how to approach git and what are going to be the new
rules to get involved in the project

Anyways, not feeling strongly on any of these, please propose
and discuss

Cheers
Andrea



--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054  Massarosa (LU)
Italy

phone: +39 0584 962313
fax:      +39 0584 962313
mob:    +39 339 8844549

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------

------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
GeoTools-Devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geotools-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git poll results, and moving on

Justin Deoliveira
Awesome, thanks for taking the lead on this Andrea. Comments inline.

On Thu, Feb 2, 2012 at 2:25 PM, Andrea Aime <[hidden email]> wrote:
Hi,
the git poll results pretty much settled down, I'd say the result
is clear enough in favor of a switch to git:
http://micropoll.com/t/LEuWWZIu5J

I guess the next steps would be to take some decisions on timing,
platform, and commit/branch management.

Let me propose something just to get started.

Timing: as soon as possible, no need to wait further

I would actually maybe say hold off until the next major release, 8.0 is out. Rationale being that switching the repository will just add one more hurdle, might be better to do it right after the release.
 
Platform: github, it already hosts the clone successfully, it's
quite popular too, should help potential contributors get started
(btw, does the current clone have the entire history?)
Agreed. And no, the repo does that have the full history. It goes back to revision 36490. When i originally svn cloned it trying to pull in everything was simply too much, and it timed out a few times. So the question is do we need a repo with full history?

I would vote for no... for a few reasons.

1. We would have to recreate the repo, and everyone who was forked it would have to refork it. Any outstanding branches could not be merged in since it is a different repo with different history. 

2. We probably have "enough" history for all intents and purposes. I have been using that repo for a while now and whenever i have had to go back in time it has never been further than the history of what is there. 

3. Cloning the repo with full history would take forever. The repo now takes a while to clone.

We could always continue to host the current svn repo just for the purpose of maintaining the history in case we do have to go back. Perhaps even turning off write access to all accounts to ensure nothing else gets committed there.

Commits: I'd say all that have commit today to svn would also
have direct commit on the "official" repo, everybody else
does a push request or provides a patch.
For large patches that need a review I guess everybody,
official devs included, do a push?

Yeah I like that. Typically I set up two remotes in my repository:

canonical -> points to the "official" repo
origin -> points to my fork of it

When doing branch development I would always push to my repo. When doing core development but fixes, etc... i would just push directly to canonical. For a change that i want reviewed a nice way is to commit to my repo, but then issue a pull request.

Which brings up pull requests. I really like them. Aside from providing an awesome interface, commenting on changes, automatically being able to apply them, etc... they would provide a nice easy to see list of patches outstanding. Currently getting this out of jira involves a few steps in the search interface. Just a thought.

Branch/tag management. Hum, I see there are some guidances
around, not sure I like them:
http://nvie.com/posts/a-successful-git-branching-model/

I believe the current svn model served us well in terms of release
management and expectations on where to find the code
(master == trunk, tags are tags, the branches are there for
the stable series, feature development is done in each developer
clone though I can also see official branches uses for that)

Yeah, while i like the model you linked too i am not sure how well it will work for geotools so I woud stick with what we have:

master -> what was trunk
2.7.x -> what was 2.7.x

Or we could have two branches:

master -> what was trunk
stable -> current stable branch

And then other branches for past branches. 
 

I also believe we should update the dev guide with some suggestions
on how to approach git and what are going to be the new
rules to get involved in the project

Agreed.
 
Anyways, not feeling strongly on any of these, please propose
and discuss

Cheers
Andrea



--
-------------------------------------------------------
Ing. Andrea Aime
GeoSolutions S.A.S.
Tech lead

Via Poggio alle Viti 1187
55054  Massarosa (LU)
Italy

phone: <a href="tel:%2B39%200584%20962313" value="+390584962313">+39 0584 962313
fax:      <a href="tel:%2B39%200584%20962313" value="+390584962313">+39 0584 962313
mob:    <a href="tel:%2B39%C2%A0339%208844549" value="+393398844549">+39 339 8844549

http://www.geo-solutions.it
http://geo-solutions.blogspot.com/
http://www.youtube.com/user/GeoSolutionsIT
http://www.linkedin.com/in/andreaaime
http://twitter.com/geowolf

-------------------------------------------------------

------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
GeoTools-Devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geotools-devel



--
Justin Deoliveira
Enterprise support for open source geospatial.


------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
GeoTools-Devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/geotools-devel
Loading...