From owner-freebsd-ports@FreeBSD.ORG  Tue Jan 22 15:59:58 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 7033333B
 for <ports@freebsd.org>; Tue, 22 Jan 2013 15:59:58 +0000 (UTC)
 (envelope-from lehmann@ans-netz.de)
Received: from avocado.salatschuessel.net (avocado.salatschuessel.net
 [78.111.72.186]) by mx1.freebsd.org (Postfix) with ESMTP id B9463F4F
 for <ports@freebsd.org>; Tue, 22 Jan 2013 15:59:57 +0000 (UTC)
Received: (qmail 82413 invoked by uid 80); 22 Jan 2013 15:59:56 -0000
Received: from dsdf-4db535f5.pool.mediaWays.net
 (dsdf-4db535f5.pool.mediaWays.net [77.181.53.245]) by
 avocado.salatschuessel.net (Horde Framework) with HTTP; Tue, 22 Jan 2013
 16:59:56 +0100
Date: Tue, 22 Jan 2013 16:59:56 +0100
Message-ID: <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net>
From: Oliver Lehmann <lehmann@ans-netz.de>
To: "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com>
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>
In-Reply-To: <50FEA5B8.9020109@gmail.com>
User-Agent: Internet Messaging Program (IMP) H5 (6.0.3)
Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
Cc: ports@freebsd.org, Guido Falsi <mad@madpilot.net>
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 15:59:58 -0000


"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 :(