From owner-freebsd-questions@FreeBSD.ORG  Tue Sep 18 03:26:46 2012
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 42F8F106566C
	for <questions@freebsd.org>; Tue, 18 Sep 2012 03:26:46 +0000 (UTC)
	(envelope-from wblock@wonkity.com)
Received: from wonkity.com (wonkity.com [67.158.26.137])
	by mx1.freebsd.org (Postfix) with ESMTP id E349A8FC15
	for <questions@freebsd.org>; Tue, 18 Sep 2012 03:26:45 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
	by wonkity.com (8.14.5/8.14.5) with ESMTP id q8I3Qjx7026343;
	Mon, 17 Sep 2012 21:26:45 -0600 (MDT)
	(envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
	by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id q8I3QjQT026340;
	Mon, 17 Sep 2012 21:26:45 -0600 (MDT)
	(envelope-from wblock@wonkity.com)
Date: Mon, 17 Sep 2012 21:26:45 -0600 (MDT)
From: Warren Block <wblock@wonkity.com>
To: Paul Schmehl <pschmehl_lists@tx.rr.com>
In-Reply-To: <39B0E74E2DF04033DE7D0080@Pauls-MacBook-Pro.local>
Message-ID: <alpine.BSF.2.00.1209172115020.26215@wonkity.com>
References: <D97788AE24B7FFB0C79AA6FB@localhost> <k38bct$ang$1@ger.gmane.org>
	<780066C6E2FAB67A997876B7@Pauls-MacBook-Pro.local>
	<20567.50041.903201.979498@jerusalem.litteratus.org>
	<39B0E74E2DF04033DE7D0080@Pauls-MacBook-Pro.local>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7
	(wonkity.com [127.0.0.1]); Mon, 17 Sep 2012 21:26:45 -0600 (MDT)
Cc: questions@freebsd.org
Subject: Re: What replaces csup?
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Sep 2012 03:26:46 -0000

On Mon, 17 Sep 2012, Paul Schmehl wrote:

> --On September 17, 2012 8:42:33 PM -0400 Robert Huff <roberthuff@rcn.com> 
> wrote:
>
>> 
>> Paul Schmehl writes:
>>
>>>  Does csup use subversion now?  Or do we need to use something
>>>  else to fetch source?
>>
>> 	As I understand it, for the average user c(vs)up and subversion
>> serve the same function using different methods (both in terms of
>> identifying what files need to be fetched and actually fetching
>> them).  At this level of discussion they are mutually exclusive.
>> 	I have switched from csup to subversion for ports and docs.
>> After modest preparation it was essentially painless.
>> 
>
> Are these modest preparations documented somewhere?

For source, save any local diffs somewhere, delete /usr/src, install svn 
from ports, svn checkout the version you want, patch from the diffs. 
Same for docs.  Example checkout of 9-STABLE:
   svn checkout svn://svn0.us-west.FreeBSD.org/base/stable/9 /usr/src

For ports, it's probably worth saving the distfile directory along with 
local diffs.  Move it back into place after the svn checkout of the 
ports tree.

After that, it's just "svn up" to update the appropriate directory.  If 
something changes in the archive that conflicts with local patches, svn 
will let you know and try to help merge the remote and local changes.
Example update of source checked out as above:
   svn up /usr/src