From owner-freebsd-hackers@FreeBSD.ORG Fri Feb 1 11:54:34 2008 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B2E616A419 for ; Fri, 1 Feb 2008 11:54:34 +0000 (UTC) (envelope-from stsp@stsp.name) Received: from einhorn.in-berlin.de (einhorn.in-berlin.de [192.109.42.8]) by mx1.freebsd.org (Postfix) with ESMTP id BBA1013C4EB for ; Fri, 1 Feb 2008 11:54:33 +0000 (UTC) (envelope-from stsp@stsp.name) X-Envelope-From: stsp@stsp.name X-Envelope-To: Received: from stsp.name (gast176.spline.inf.fu-berlin.de [130.133.110.176]) (authenticated bits=128) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id m11BsWXv016462 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 1 Feb 2008 12:54:32 +0100 Received: from jack.stsp.name (stsp@localhost.stsp.name [127.0.0.1]) by stsp.name (8.14.1/8.14.1) with ESMTP id m11BsWxt003332 for ; Fri, 1 Feb 2008 12:54:32 +0100 (CET) Received: (from stsp@localhost) by jack.stsp.name (8.14.1/8.14.1/Submit) id m11BsVIw003170 for freebsd-hackers@freebsd.org; Fri, 1 Feb 2008 12:54:31 +0100 (CET) X-Authentication-Warning: jack.stsp.name: stsp set sender to stsp@stsp.name using -f Date: Fri, 1 Feb 2008 12:54:31 +0100 From: Stefan Sperling To: freebsd-hackers@freebsd.org Message-ID: <20080201115431.GF2324@jack.stsp.name> Mail-Followup-To: freebsd-hackers@freebsd.org References: <78cb3d3f0801302245v2183c613t6ecdd9acebbe9ef7@mail.gmail.com> <47A1700B.3090406@gmail.com> <47A18EDA.4040501@elischer.org> <200801311025.55412.wundram@beenic.net> <947010c30801310200y20fae02eqd188d90086a7fc2d@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NQTVMVnDVuULnIzU" Content-Disposition: inline In-Reply-To: <947010c30801310200y20fae02eqd188d90086a7fc2d@mail.gmail.com> User-Agent: Mutt/1.5.17 (2007-11-01) X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 Subject: Re: [OT] Q: what would you choose for a VCS today X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 11:54:34 -0000 --NQTVMVnDVuULnIzU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 31, 2008 at 11:00:25AM +0100, Johan Bucht wrote: > I've only tried CVS, Mericurial, Clearcase and a bit of Subversion. > And if you don't need IDE integration Mercurial seems to be working > pretty good. > I just read an article about the new merging and branching support > coming in Subversion 1.5 and it looks like it might have some future. > The IDE support is probably the best of the modern open source VCS. >=20 > http://www.javaworld.com/javaworld/jw-01-2008/jw-01-svnmerging.html Yes, merge tracking will definitely make it much easier to maintain branches in Subversion, including vendor branches containing a FreeBSD source tree. You can achieve much of the same effect by using the svnmerge.py script that ships with Subversion 1.4, but with 1.5 the server and client have merge tracking built in, so it's not a python script wrapper anymore, but a well-integrated feature. 1.5 has finally been branched a few days ago actually, so if you want to try it out go ahead and check out the branch and report any issues you find: svn co http://svn.collab.net/repos/svn/branches/1.5.x svn-1.5 --=20 stefan http://stsp.name PGP Key: 0xF59D25F0 --NQTVMVnDVuULnIzU Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (OpenBSD) iD8DBQFHowh35dMCc/WdJfARAgpkAJ9Bcolhc87/PD1kOXpkstiWrDwkzACgniEo BmbI54rlis3EleilAubudD8= =5X7t -----END PGP SIGNATURE----- --NQTVMVnDVuULnIzU--