From owner-freebsd-hackers@FreeBSD.ORG  Thu Dec 27 17:15:47 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 682D79AE
 for <freebsd-hackers@freebsd.org>; Thu, 27 Dec 2012 17:15:47 +0000 (UTC)
 (envelope-from sem@FreeBSD.org)
Received: from mail.ciam.ru (mail.ciam.ru [91.209.218.18])
 by mx1.freebsd.org (Postfix) with ESMTP id 0FE078FC08
 for <freebsd-hackers@freebsd.org>; Thu, 27 Dec 2012 17:15:46 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ciam.ru;
 s=dkim; 
 h=Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Subject:CC:To:MIME-Version:From:Date:Message-ID;
 bh=qcA2KskT7eLgYMQ4C2M/GUflxDYrOeevmVQ/ITQ/Yrg=; 
 b=fg1IiSov66DQPs8yiW7A0UhvKWTIYIbpxBQzfmarJ+xedxtl1ZeA1j78wxoxgomU6cHQ3JsHtjQ1KpdLD/mAcc4f2u4y9F9EhIp6uip6vfGmmSN0sLfEKoZhfL++1cO94MYBuVHB96WF+WIi1D1nNpR+p0ZdVN+gEZion3332gU=;
Received: from dhcp170-188-red.yandex.net ([95.108.170.188])
 by mail.ciam.ru with esmtpa (Exim 4.x)
 id 1ToGSW-0006vj-R9; Thu, 27 Dec 2012 20:37:28 +0400
Message-ID: <50DC7958.70305@FreeBSD.org>
Date: Thu, 27 Dec 2012 20:37:44 +0400
From: Sergey Matveychuk <sem@FreeBSD.org>
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64;
 rv:17.0) Gecko/17.0 Thunderbird/17.0
MIME-Version: 1.0
To: "Sam Fourman Jr." <sfourman@gmail.com>
Subject: Re: cvs deprecated
References: <alpine.BSF.2.00.1212271016340.35118@wojtek.tensor.gdynia.pl>
 <CAOFF+Z0qxL2heuheHNJFTKHsV8PWMs4ih63hMg7jYb=zcOk-5w@mail.gmail.com>
In-Reply-To: <CAOFF+Z0qxL2heuheHNJFTKHsV8PWMs4ih63hMg7jYb=zcOk-5w@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
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 17:15:47 -0000

27.12.2012 20:29, 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
>

svn revert -R /usr/ports - works for me.