From owner-freebsd-ports@FreeBSD.ORG  Tue Jan 22 16:13:19 2013
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id C9AAA6C2
 for <ports@freebsd.org>; Tue, 22 Jan 2013 16:13:19 +0000 (UTC)
 (envelope-from mad@madpilot.net)
Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155])
 by mx1.freebsd.org (Postfix) with ESMTP id 8AC2FFE7
 for <ports@freebsd.org>; Tue, 22 Jan 2013 16:13:19 +0000 (UTC)
Received: from winston.madpilot.net (localhost [127.0.0.1])
 by winston.madpilot.net (Postfix) with ESMTP id 3YrF6N2RgQzFTvZ;
 Tue, 22 Jan 2013 17:13:16 +0100 (CET)
X-Virus-Scanned: amavisd-new at madpilot.net
Received: from winston.madpilot.net ([127.0.0.1])
 by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new,
 port 10024)
 with ESMTP id qkm_IjunzBcT; Tue, 22 Jan 2013 17:13:14 +0100 (CET)
Received: from vwg82.hq.ignesti.it (unknown [80.74.176.55])
 by winston.madpilot.net (Postfix) with ESMTPSA;
 Tue, 22 Jan 2013 17:13:14 +0100 (CET)
Message-ID: <50FEBA9B.3060609@madpilot.net>
Date: Tue, 22 Jan 2013 17:13:15 +0100
From: Guido Falsi <mad@madpilot.net>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130115 Thunderbird/17.0.2
MIME-Version: 1.0
To: Oliver Lehmann <lehmann@ans-netz.de>
Subject: Re: portsnap - overwrite local changes
References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net>
 <50FE859B.7010607@madpilot.net>
 <20130122140038.Horde.8nr2dFTy5nEGcYtN8VWTjA6@avocado.salatschuessel.net>
 <50FEA5B8.9020109@gmail.com>
 <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net>
In-Reply-To: <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: ports@freebsd.org, "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com>
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 16:13:19 -0000

On 01/22/13 16:59, Oliver Lehmann wrote:
>
> "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com> wrote:
>> I know when I run it manually and there is a conflict, it will tell me
>> about a merge-conflict and ask me which file to keep (mine or theirs),
>> selecting theirs, afaik, overwrites my local file.
>
> And when there is no conflict and it can be merged, you have a merged
> file. And in some point in time your local /usr/ports is messed up
> with forgotten local changes and so on... I just wanna make sure to
> automatically "clean up" my /usr/ports. CVSup did this :(

As I said, svn revert -R . does remove local changes to tracked files. 
It will ignore added files it does not know about.

-- 
Guido Falsi <mad@madpilot.net>