[olug] Fwd: [odynug] Presentation request: git workshop

[Luke-Jr]

I never understood git-svn, whereas bzr-svn "just works" as if the Subversion 
repository was a Bazaar one... even the commands are (for the most part) 
identical.

I like git's design, but having used it, I've noticed numerous flaws in 
contrast to other VCS... one of which I wrote a patch to fix, but got ignored 
by the git upstream :(

Anyhow, the biggest problem with git-svn and bzr-svn IMO is that they are not 
lossless. Subversion supports per-file metadata, copies, and cherry picking, 
whereas neither Bazaar nor Git can even remember this data. That said, the 
benefits of a Distributed VCS usually outweigh those features, and I tend to 
use Bazaar or Git for new projects. :)

On Monday 07 June 2010 01:58:57 pm Rob Townley wrote:
> Since Linux development uses git, i am sure there are many OLUG users
> that would get a great deal out of this free workshop!
> 
> If you have svn repositories, you can still use git svn to get updates.
> 
> 
> ---------- Forwarded message ----------
> From: Jay Hannah <jay at jays.net>
> Date: Sun, May 16, 2010 at 9:00 AM
> Subject: Re: [odynug] Presentation request: git workshop
> To: odynug at googlegroups.com
> 
> On May 15, 2010, at 4:56 PM, Stephen Haberman wrote:
> > Nonetheless, yeah, I'd have fun helping out with a workshop like this.
> > I did a git/git-svn talk at OJUG back in January, and showed some
> > basic "push from here, pull from there" stuff, but it definitely wasn't
> > as cool/interactive as having people go through it on their own.
> >
> > Please keep me in the loop if you want to put something together.
> 
> So... maybe something like this?
> 
> Stephen is our git wizard and Our Boss. He controls the "official"
> upstream repository and reviews all our changes.
> 
> All of us attendee worker drones are charged with a series of
> "programming tasks". By "programming task" I mean things like "change
> all the words 'yellow' to 'blue' in these 3 files" -- the focus of
> this workshop is git, not actual programming.
> 
> Us worker drones each receive a series of these tasks. Some of them
> are worked independently, some of them are worked in programmer teams.
> Team project mean that 2-4 of us "split off" into our own little hub
> of changes and then prepare a single commit for Stephen.
> 
> As we complete tasks we send "git pull" requests to Stephen and he
> verifies or rejects our work. (And bails us out if we've screwed up
> git.)
> 
> (After things go smoothly for a while and we all get comfortable,
> trouble ensues. Some tasks will conflict with other simultaneous
> tasks. Some tasks will reverse or alter or conflict with earlier
> tasks. Some tasks will be rejected by Stephen, who has received new
> orders from the customer, sending us back to fix it. No, we did not
> get the memo.)
> 
> If this sounds interesting to people and Stephen is game, then I
> hereby volunteer to write up the workshop scenarios. I don't have the
> git skills to play the role of The Boss. But I can probably write up a
> series of trouble-inducing tasks.
> 
> If you want to help me (or lead!) writing up the scenarios please say so!
>   :)
> 
> Stephen: Are you available for our July 13 meeting?
> 
> j