From owner-freebsd-hackers@FreeBSD.ORG  Thu Dec 27 23:04:59 2012
Return-Path: <owner-freebsd-hackers@FreeBSD.ORG>
Delivered-To: freebsd-hackers@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A7E65CB3
 for <freebsd-hackers@freebsd.org>; Thu, 27 Dec 2012 23:04:59 +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 5E88D8FC08
 for <freebsd-hackers@freebsd.org>; Thu, 27 Dec 2012 23:04:59 +0000 (UTC)
Received: from wonkity.com (localhost [127.0.0.1])
 by wonkity.com (8.14.5/8.14.5) with ESMTP id qBRN4wPh043708;
 Thu, 27 Dec 2012 16:04:58 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Received: from localhost (wblock@localhost)
 by wonkity.com (8.14.5/8.14.5/Submit) with ESMTP id qBRN4vjf043705;
 Thu, 27 Dec 2012 16:04:57 -0700 (MST)
 (envelope-from wblock@wonkity.com)
Date: Thu, 27 Dec 2012 16:04:57 -0700 (MST)
From: Warren Block <wblock@wonkity.com>
To: "Sam Fourman Jr." <sfourman@gmail.com>
Subject: Re: cvs deprecated
In-Reply-To: <CAOFF+Z0qxL2heuheHNJFTKHsV8PWMs4ih63hMg7jYb=zcOk-5w@mail.gmail.com>
Message-ID: <alpine.BSF.2.00.1212271556040.43547@wonkity.com>
References: <alpine.BSF.2.00.1212271016340.35118@wojtek.tensor.gdynia.pl>
 <CAOFF+Z0qxL2heuheHNJFTKHsV8PWMs4ih63hMg7jYb=zcOk-5w@mail.gmail.com>
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]); Thu, 27 Dec 2012 16:04:58 -0700 (MST)
Cc: Wojciech Puchar <wojtek@wojtek.tensor.gdynia.pl>,
 freebsd-hackers@freebsd.org
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
 <freebsd-hackers.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 27 Dec 2012 23:04:59 -0000

On Thu, 27 Dec 2012, Sam Fourman Jr. wrote:

> On Thu, Dec 27, 2012 at 4:18 AM, Wojciech Puchar
> <wojtek@wojtek.tensor.gdynia.pl> wrote:
>> but i can't find "moron guide" for using svn to update tree.
>
> I cant seem to find a way to handle conflicts, ive tried to do svn
> revert on every directory, but there is always more... maybe svn just
> isnt a good way to keep your ports tree current
>
> svn up
> Updating '.':
> Skipped 'databases' -- Node remains in conflict
> Skipped 'irc' -- Node remains in conflict
> Skipped 'lang' -- Node remains in conflict
> Skipped 'security/cyrus-sasl2' -- Node remains in conflict
> Skipped 'x11/keybinder' -- Node remains in conflict
> Skipped 'net-mgmt' -- Node remains in conflict
> At revision 309546.
> Summary of conflicts:
>  Skipped paths: 6

A checkout of the entire /usr/ports into an empty directory is the way 
to start.  You can save the distfiles directory out of an existing 
/usr/ports first if desired.  And any customizations to ports files, if 
you have them.

Note that svn checkouts don't automatically combine.  Checking out 
/usr/ports is not equivalent to checking out all the category 
subdirectories into /usr/ports.