From owner-freebsd-ports@FreeBSD.ORG  Tue Jan 22 13:00:39 2013
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 96616EB0
 for <ports@freebsd.org>; Tue, 22 Jan 2013 13:00:39 +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 E5FE71CB
 for <ports@freebsd.org>; Tue, 22 Jan 2013 13:00:38 +0000 (UTC)
Received: (qmail 75664 invoked by uid 80); 22 Jan 2013 13:00:38 -0000
Received: from 164.61.223.12 ([164.61.223.12]) by avocado.salatschuessel.net
 (Horde Framework) with HTTP; Tue, 22 Jan 2013 14:00:38 +0100
Date: Tue, 22 Jan 2013 14:00:38 +0100
Message-ID: <20130122140038.Horde.8nr2dFTy5nEGcYtN8VWTjA6@avocado.salatschuessel.net>
From: Oliver Lehmann <lehmann@ans-netz.de>
To: Guido Falsi <mad@madpilot.net>
Subject: Re: portsnap - overwrite local changes
References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net>
 <50FE859B.7010607@madpilot.net>
In-Reply-To: <50FE859B.7010607@madpilot.net>
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
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 13:00:39 -0000


Guido Falsi <mad@madpilot.net> wrote:

> If you use small modifications on a ingle system(or just a few) you  
> could track the ports tree with subversion, which will be happy to  
> keep and try to merge your local modifcations. You can also diff and  
> revert your modifications using it, which can be quite handy.
>
> Disvantage is you will sometime need to merge conflicts which could  
> require you to study subversion more than what you really want.

Ok, subversion came also to my mind but I guess portsnap is faster then
svn is. The thing with svn is, that I would always need to examine the
logs if there where conflicts generated.

I don't want to keep my local changes. I would like to have command
which just gets me a 1:1 copy of the "current" ports tree and deletes
or overwrites my local changes. There is nothing I want to get merged.