From owner-freebsd-ports@FreeBSD.ORG Tue Jan 22 14:44:47 2013 Return-Path: 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 BE06C9CF for ; Tue, 22 Jan 2013 14:44:47 +0000 (UTC) (envelope-from jnagyjr1978@gmail.com) Received: from mail-gg0-f179.google.com (mail-gg0-f179.google.com [209.85.161.179]) by mx1.freebsd.org (Postfix) with ESMTP id 85379A49 for ; Tue, 22 Jan 2013 14:44:47 +0000 (UTC) Received: by mail-gg0-f179.google.com with SMTP id h4so273889ggn.24 for ; Tue, 22 Jan 2013 06:44:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:cc :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=qoFoGk1zPn2EBnjUa68HCop0QkxwR37nfw8KddMhIyg=; b=IzqfTE2i+U1+INMoDtU29gkF23bUBufMrf+Ub64fbGSNxskjM+jPLbVJJVevlFHqmD +5FGZnJNUCBkbFYOoirj3htSq/okcBDeot5b7/1v6INGBd8CLd8Q/lCuyl7oVU7BC4un 9lcDq/AjgTHWCfmw9bvPm+8dmJ8JI2DFXu3c+bNtiQC5JDG6w1JkDuSQ1hITgWUmZFDV mV6sZVaSSHP5dnDwfaJ8aR6PcqgZBxyyYX2qKvbDpAz0ghwKJ9PW9OcoyhmoffCYwWor CcCDPU9fGsBoAUhEoIEI4Mhg6Psj+RieqrKfPufXtECDpSz50Oq7Pe3xhTvrP2k5IEGH Fs8Q== X-Received: by 10.101.138.33 with SMTP id q33mr66083ann.9.1358865881580; Tue, 22 Jan 2013 06:44:41 -0800 (PST) Received: from [192.168.1.33] (vid-196.dhcp.grp10.tnmmrl.infoave.net. [204.116.254.196]) by mx.google.com with ESMTPS id w2sm16783368yhk.8.2013.01.22.06.44.14 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jan 2013 06:44:40 -0800 (PST) Message-ID: <50FEA5B8.9020109@gmail.com> Date: Tue, 22 Jan 2013 08:44:08 -0600 From: "Joseph A. Nagy, Jr" User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130112 Thunderbird/17.0.2 MIME-Version: 1.0 To: Oliver Lehmann Subject: Re: portsnap - overwrite local changes References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net> <50FE859B.7010607@madpilot.net> <20130122140038.Horde.8nr2dFTy5nEGcYtN8VWTjA6@avocado.salatschuessel.net> In-Reply-To: <20130122140038.Horde.8nr2dFTy5nEGcYtN8VWTjA6@avocado.salatschuessel.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org, Guido Falsi X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jan 2013 14:44:47 -0000 On 01/22/13 07:00, Oliver Lehmann wrote: > > Guido Falsi 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. I use svn in a cron job to update my ports tree and the few times I make a local change I don't think I've ever had it stay past the next update. I don't issue any special commands, just 'svn up /usr/ports' via cron (along with a check to see what's been updated). 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. -- Yours in Christ, Joseph A Nagy Jr "Whoever loves instruction loves knowledge, But he who hates correction is stupid." -- Proverbs 12:1 Emails are not formal business letters, whatever businesses may want. Original content CopyFree (F) under the OWL http://owl.apotheon.org