threads / discuss / 1565

Small team cogito/git setup

Subject: Small team cogito/git setup

## tl;dr

3 messages between Aug 18, 2005 and Aug 19, 2005.

replies: 2people: 2as markdown or json

Martin Langhoff· Aug 18, 2005, 04:14 UTC · lore

We have a small team of 3, and our main activity is to run local branches of upstream projects, plus some local development. In that context, I am designing our cogito/git usage strategy, and I'm interested in comments.

My intention is to use cogito as much as possible, and insulate our team from git internals. I find that using cogito is actually easier than cvs, and a mile easier than Arch (the two tools we use currently) and I rather keep it that way: simple.

The upstream projects run on CVS, so I am setting up a repo fed by git-cvsimport for each of those. We all pull from that repo (cg-clone), so we can all see the upstream in its git representation. Now, we are going to run a few branches off that, and I want to have those branches _teamwide_ with the same name, so it is trivial for us to keep synching.

All our work directories on our LAN will available via HTTP, so we can pull from the team repositories easily. Is there a good technique with cogito to have a team pull from each other, so that a single cg-update or cg-pull when working on a branch pulls from all my teammembers.

Or are we forced to run an 'integration' repo so that we work with a 'star' arrangement? I am actually trying to avoid needing a central repo if possible.

How should branch creation be handled for team-wide branches? I'd like to have branches use the same name across the team to avoid confusion.

Phew. Every time I think I understand how things go with git, I find I don't know sh*t about it yet ;)

martin

Matthias Urlichs· Aug 18, 2005, 09:37 UTC · re: Martin Langhoff · lore

Re: Small team cogito/git setup

Hi, Martin Langhoff wrote:

> Or are we forced to run an 'integration' repo so that we work with a
> 'star' arrangement? I am actually trying to avoid needing a central
> repo if possible.

Personally, I like the idea of an integration repository. The main reason is that it avoids duplicate work and shifting blame for broken software, particularly if you have a test suite.

My workflow is "develop, test, check-in, pull-and-merge, test-if-merged, push". That tends to yield a saner change history, and requires less work, than doing it for every co-worker.

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
"Fundamentalists are like the fir trees in German forests: they cannot
 stand alone, and are only stable when crowded together, branches locked
 with those of their brothers. That is why we must always fear them,
 because they will always hate us for our individualism."
     [Brent Yaciw, with inspirational regards to Jack M. Bickham]

Martin Langhoff· Aug 19, 2005, 01:03 UTC · re: Martin Langhoff · lore

Re: Small team cogito/git setup

On 8/18/05, Martin Langhoff <martin.langhoff@gmail.com> wrote:

> We have a small team of 3, and our main activity is to run local

To self: RTFM, specifically, Documentation/tutorial.txt

I had read it early on and either didn't get to the end of it, or had forgotten already.

Apologies,

martin