From owner-freebsd-questions@FreeBSD.ORG Thu Dec 22 23:05:53 2011 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFD27106567F for ; Thu, 22 Dec 2011 23:05:53 +0000 (UTC) (envelope-from william.e.brown@adelaide.edu.au) Received: from mailguard-send.adelaide.edu.au (pulteney-pix.border.net.adelaide.edu.au [192.43.227.18]) by mx1.freebsd.org (Postfix) with ESMTP id B733E8FC29 for ; Thu, 22 Dec 2011 23:05:52 +0000 (UTC) X-SBRS: None X-Listener: MTA_SUBM X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApgBAFO0807LesJt/2dsb2JhbAAMN6N/AYUShhUBAQEBAgFzCwsLGC5XBogNrjOJBYssYwSnRg X-IronPort-AV: E=Sophos;i="4.71,396,1320586200"; d="sig'?scan'208,217";a="43178079" Received: from ppp194-109.static.internode.on.net (HELO [172.24.0.19]) ([203.122.194.109]) by talos-private.services.adelaide.edu.au with ESMTP/TLS/AES128-SHA; 23 Dec 2011 09:23:24 +1030 From: William Brown Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="Apple-Mail-40-542335606" Date: Fri, 23 Dec 2011 09:23:22 +1030 In-Reply-To: <4EF2FA12.5010606@infracaninophile.co.uk> To: freebsd general questions References: <4EF29AD7.5040807@herveybayaustralia.com.au> <4EF2FA12.5010606@infracaninophile.co.uk> Message-Id: <9054C93B-B423-4C34-B95D-3C4119FC2C45@adelaide.edu.au> Content-Transfer-Encoding: 7bit X-Pgp-Agent: GPGMail 1.3.3 X-Mailer: Apple Mail (2.1084) X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: Re: Revision control advice X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 23:05:53 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --Apple-Mail-40-542335606 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 22/12/2011, at 20:06, Matthew Seaman wrote: > On 22/12/2011 04:53, Rob Byrnes wrote: >>>> Yeah I would second what Mr Rock says. Set up a single repo where >>>>>> folders can be used for projects. Since svn lets you checkout = sub >>>>>> folders of a repo, each developer can check out the folder that >>>>>> corresponds to their project. Also, Tortoise svn is a very nice >>>>>> graphical utility that will allow your developers to manage there = svn >>>>>> folders without even needing a web interface (most non unix = people >>>>>> that I know like tortoise), so there is less maintenance for you = :) >>>>>> Finally, kudos to moving towards using version control, its an >>>>>> important step for a software company. >>>>=20 >>>> git or mercurial - best choices >>=20 >> For what reasons? >=20 > svn vs git vs mercurial >=20 > svn has the model of a central repository that everything has to > communicate with. This can be attractive in a commercial environment = as > it implies a degree of central control over all of the project source = code. >=20 > git is much more a peer-to-peer system. This fits with a disparate > group of projects all proceeding pretty much independently. There's > also a potential advantage if all your developers are not at the same > location and will not necessarily have access to central office = systems. >=20 > mercurial unfortunately I'm not that familiar with, but it uses a > distributed model like git. I would advise staying away from mercurial (aka hg). It has a lot of = issues with corruption of repositories. Git does the same and is a lot = more mature and stable.=20 >=20 > Other criteria, like windows support, are not anything I have much > experience of, but by all accounts svn and git are pretty well served. Again, git wins here. It has good support on windows, as well as with = graphical tools on windows.=20 You can use git like SVN if you push to the master after every commit = though. I also have found git's support for merging to be a lot better. = Additionally it stores branches and tags as metadata on commits rather = than svn's "dumb" tag / branch system where you just copy the full repo = to the side. Git does take a bit longer to get your head around how some of the tools = work, but once you learn it, it really pays off.=20 Sincerely, William Brown Research & Teaching, Technology Services The University of Adelaide, AUSTRALIA 5005 CRICOS Provider Number 00123M = --------------------------------------------------------------------------= --- IMPORTANT: This message may contain confidential or legally privileged information. If you think it was sent to you by mistake, please delete = all copies and advise the sender. For the purposes of the SPAM Act 2003, = this email is authorised by The University of Adelaide. pgp.mit.edu --Apple-Mail-40-542335606 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) Comment: GPGTools - http://gpgtools.org iQIcBAEBAgAGBQJO87TjAAoJEDwKxtqy+Sii9ZIQALTBT/BOJ0P22BlCHOWKF3Wn m9J9Fbe7aHBhHLys+uj7B+WnGVqJB6AoHMED/QhlBYB/7fm188IWHOxRMxwVvezp iThMwANnC9GYDprMk4ZTCbj/9yHQfJtD3v3gBe+k+ODNaz/zLLNnj5TXJP1Ufxzk PwL/N5GjbEfgxLeAyS8P/C/RxhxBYCM6wuLNlMEUvPnZq5VtbHXCRjB5EsU1Qcw5 +i7F1X5ICy8A5AUDHBPPsIy/rTOjYKwuNcF73TKHlvGK3UTCfoQdJteI79wQRhgT bb1Y1JhbF0t6SRDUIXOZzJxja4e2a43P6NW8onlNOapflgv+OM8GX7KhN95Ees/Z QUhJCVntuavsZLHbUJHfA3VpiKNXicBvevm1SBxn4VqiYdpXCsvvB/v+OUdFlC1l y3xLa7zwX3E+1+M9UCSQt7BMlUkw4SuLxU7nOyrCwvBcEPKF8ygu5f6oUSRg+bPP Q7msuS4AJ1TwgmU867SkdowO1PzndDdChL15R8lUnDv1CKtaAgLxWVAMQvYSTm/M wSzZLh+qzcWkyKa3f/dmhGFaR1p/vx+D1FSq8hXbnbz8XF5TXLFYaJyusALFSRkt zoh9a4FyI/H0xmmYt6wVTMbR0uGsKugpHtajL1WsGDk32d5eXYVW6QwJcDeqlVYz 5rD4xx7cZdY/dxZQBZ4d =fbdC -----END PGP SIGNATURE----- --Apple-Mail-40-542335606--