From owner-freebsd-hackers@FreeBSD.ORG  Thu Jan 31 18:21:28 2008
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
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 C53FF16A41B
	for <freebsd-hackers@freebsd.org>; Thu, 31 Jan 2008 18:21:28 +0000 (UTC)
	(envelope-from tevans.uk@googlemail.com)
Received: from fk-out-0910.google.com (fk-out-0910.google.com [209.85.128.184])
	by mx1.freebsd.org (Postfix) with ESMTP id CFD4513C46A
	for <freebsd-hackers@freebsd.org>; Thu, 31 Jan 2008 18:21:27 +0000 (UTC)
	(envelope-from tevans.uk@googlemail.com)
Received: by fk-out-0910.google.com with SMTP id b27so849477fka.11
	for <freebsd-hackers@freebsd.org>; Thu, 31 Jan 2008 10:21:26 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=gamma;
	h=domainkey-signature:received:received:subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer;
	bh=tIEFqKKywt0j/WSelW562JI+J1cZpFb11Fs1tyU8+gQ=;
	b=xzp0qgL2iTA+x6A7S667km7M4nSvgGG/cBF8HNfFH0rRpousKZmaskp+e8vxVd7CJ2xRJKDhIRybCH88iJnm6SdKbVdsYxSqoa/IRYRsnljnWiRdwy1crptFMOS3LqaZe5iPUdO55hJQcoWzWBLFEktFOIfQ/gpLOgL2Ip6lXyM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma;
	h=subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer;
	b=hSOg0Jz+2Q2BbPvKNpiFo/PwEzNJ/pyTB2EjN6dciF6C4ocQmpFxZjT7fqW6kbT1G8YNZ962uios70xvGid+r6iyS8HmqRzN84Al/hj+/0IWeldPy98T/frG1AMygkTdTfJhWToBllB+m+aTVu0indABQSDreGguK4Iuod4Hwn0=
Received: by 10.82.186.5 with SMTP id j5mr4315259buf.12.1201802006162;
	Thu, 31 Jan 2008 09:53:26 -0800 (PST)
Received: from ?127.0.0.1? ( [217.206.187.79])
	by mx.google.com with ESMTPS id i6sm5202538gve.5.2008.01.31.09.53.24
	(version=SSLv3 cipher=RC4-MD5); Thu, 31 Jan 2008 09:53:25 -0800 (PST)
From: Tom Evans <tevans.uk@googlemail.com>
To: Mike Meyer <mwm@mired.org>
In-Reply-To: <20080131110237.06860561@mbook.mired.org>
References: <78cb3d3f0801302245v2183c613t6ecdd9acebbe9ef7@mail.gmail.com>
	<20080131110237.06860561@mbook.mired.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-qMtE3NWz82nxY3cT3cVN"
Date: Thu, 31 Jan 2008 17:53:23 +0000
Message-Id: <1201802003.2975.10.camel@localhost>
Mime-Version: 1.0
X-Mailer: Evolution 2.10.2 FreeBSD GNOME Team Port 
Cc: freebsd-hackers@freebsd.org, Adrian Penisoara <ady@freebsd.ady.ro>
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
	<freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
	<mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-hackers>,
	<mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jan 2008 18:21:28 -0000


--=-qMtE3NWz82nxY3cT3cVN
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

On Thu, 2008-01-31 at 11:02 -0500, Mike Meyer wrote:
> On Thu, 31 Jan 2008 08:45:55 +0200 "Adrian Penisoara" <ady@freebsd.ady.ro=
> wrote:
> .... Subversion is a close second, but is still a little rough
> around the edges. Most notably, merge tracking is in the 1.5 beta
> builds, but not in the production code.
>=20
> 	<mike

At $JOB, we moved to subversion from CVS about 2-3 years ago. We're
still using subversion for everything, and use svnmerge.py [1] to manage
development and release branches. It isn't ideal, as you lose
information about the individual commits within a merged patchset, which
makes it a minor pain to back out a specific commit from a merged
patchset.

Other features we're looking forward to is read-only slaves that post
back commits to a global master site, which would greatly please our
North American colleagues, save them from having to pull repos from over
the pond.

Tom

[1] http://www.orcaware.com/svn/wiki/Svnmerge.py

--=-qMtE3NWz82nxY3cT3cVN
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)

iD8DBQBHogsPlcRvFfyds/cRAtIPAKCk3KAR8oqWUTpIKIxP/K9ZQDA84gCfY7Po
L/T5veD7qKpxpryp07CxmAc=
=FPW6
-----END PGP SIGNATURE-----

--=-qMtE3NWz82nxY3cT3cVN--