{"thread":{"id":"1565","subject":"Small team cogito/git setup","startedAt":"2005-08-18T04:14:30Z","lastAt":"2005-08-19T01:03:32Z","messageCount":3,"participants":["Martin Langhoff","Matthias Urlichs"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"7485","messageId":"46a038f9050817211446684aac@mail.gmail.com","threadId":"1565","inReplyTo":null,"subject":"Small team cogito/git setup","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-08-18T04:14:30Z","receivedAt":"2005-08-18T04:14:30Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"We have a small team of 3, and our main activity is to run local\nbranches of upstream projects, plus some local development. In that\ncontext, I am designing our cogito/git usage strategy, and I'm\ninterested in comments.\n\nMy intention is to use cogito as much as possible, and insulate our\nteam from git internals. I find that using cogito is actually easier\nthan cvs, and a mile easier than Arch (the two tools we use currently)\nand I rather keep it that way: simple.\n\nThe upstream projects run on CVS, so I am setting up a repo fed by\ngit-cvsimport for each of those. We all pull from that repo\n(cg-clone), so we can all see the upstream in its git representation.\nNow, we are going to run a few branches off that, and I want to have\nthose branches _teamwide_ with the same name, so it is trivial for us\nto keep synching.\n\nAll our work directories on our LAN will available via HTTP, so we can\npull from the team repositories easily. Is there a good technique with\ncogito to have a team pull from each other, so that a single cg-update\nor cg-pull when working on a branch pulls from all my teammembers.\n\nOr are we forced to run an 'integration' repo so that we work with a\n'star' arrangement? I am actually trying to avoid needing a central\nrepo if possible.\n\nHow should branch creation be handled for team-wide branches? I'd like\nto have branches use the same name across the team to avoid confusion.\n\nPhew. Every time I think I understand how things go with git, I find I\ndon't know sh*t about it yet ;)\n\nmartin\n"},{"id":"7493","messageId":"pan.2005.08.18.09.37.25.359432@smurf.noris.de","threadId":"1565","inReplyTo":"46a038f9050817211446684aac@mail.gmail.com","subject":"Re: Small team cogito/git setup","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-08-18T09:37:27Z","receivedAt":"2005-08-18T09:37:27Z","isPatch":false,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Martin Langhoff wrote:\n\n> Or are we forced to run an 'integration' repo so that we work with a\n> 'star' arrangement? I am actually trying to avoid needing a central\n> repo if possible.\n\nPersonally, I like the idea of an integration repository. The main reason\nis that it avoids duplicate work and shifting blame for broken software,\nparticularly if you have a test suite.\n\nMy workflow is \"develop, test, check-in, pull-and-merge, test-if-merged,\npush\". That tends to yield a saner change history, and requires less work,\nthan doing it for every co-worker.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\n\"Fundamentalists are like the fir trees in German forests: they cannot\n stand alone, and are only stable when crowded together, branches locked\n with those of their brothers. That is why we must always fear them,\n because they will always hate us for our individualism.\"\n     [Brent Yaciw, with inspirational regards to Jack M. Bickham]\n"},{"id":"7532","messageId":"46a038f905081818034db50747@mail.gmail.com","threadId":"1565","inReplyTo":"46a038f9050817211446684aac@mail.gmail.com","subject":"Re: Small team cogito/git setup","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-08-19T01:03:32Z","receivedAt":"2005-08-19T01:03:32Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 8/18/05, Martin Langhoff <martin.langhoff@gmail.com> wrote:\n> We have a small team of 3, and our main activity is to run local\n\nTo self: RTFM, specifically, Documentation/tutorial.txt \n\nI had read it early on and either didn't get to the end of it, or had\nforgotten already.\n\nApologies,\n\n\nmartin\n"}]}