From owner-freebsd-current@FreeBSD.ORG Wed Aug 18 16:14:14 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1B66B16A4CE; Wed, 18 Aug 2004 16:14:14 +0000 (GMT) Received: from saturn.criticalmagic.com (saturn.criticalmagic.com [64.74.124.105]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB85343D53; Wed, 18 Aug 2004 16:14:13 +0000 (GMT) (envelope-from rcoleman@criticalmagic.com) Received: from [172.16.0.202] (c-24-99-11-35.atl.client2.attbi.com [24.99.11.35]) by saturn.criticalmagic.com (Postfix) with ESMTP id 42A803BD21; Wed, 18 Aug 2004 12:14:13 -0400 (EDT) Message-ID: <412380F2.3040707@criticalmagic.com> Date: Wed, 18 Aug 2004 12:16:50 -0400 From: Richard Coleman User-Agent: Mozilla Thunderbird 0.7.3 (Windows/20040803) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Robert Watson References: In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: freebsd-current@freebsd.org cc: current@freebsd.org Subject: Re: Public Access to Perforce? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Aug 2004 16:14:14 -0000 Robert Watson wrote: > Last I looked, my primary concerns with Subversion were: > > - Cost to import full FreeBSD history. > > - That it promised the multi-way branching and merging in a future > release, but did not yet have it. > > Do you know how things look with respect to the second issue? > > Robert N M Watson FreeBSD Core Team, TrustedBSD Projects > robert@fledge.watson.org Principal Research Scientist, McAfee > Research Reading the ChangeLog for the upcoming subversion-1.1 release, it doesn't look like it. http://svn.collab.net/repos/svn/trunk/CHANGES My understanding is that the merge functionality in subversion is still about the same that is currently in CVS (although faster). But there's no denying that subversion is getting better by the day. For a new project, I wouldn't hesitate to suggest subversion. But for a large, existing project like *BSD there doesn't seem to be a compelling reason to switch (yet). But that will change eventually. Richard Coleman rcoleman@criticalmagic.com