From owner-freebsd-ports@FreeBSD.ORG Tue Jan 22 16:21:37 2013 Return-Path: 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 B8F4D93D for ; Tue, 22 Jan 2013 16:21:37 +0000 (UTC) (envelope-from jnagyjr1978@gmail.com) Received: from mail-gg0-f176.google.com (mail-gg0-f176.google.com [209.85.161.176]) by mx1.freebsd.org (Postfix) with ESMTP id 7F05BDC for ; Tue, 22 Jan 2013 16:21:37 +0000 (UTC) Received: by mail-gg0-f176.google.com with SMTP id h3so1114027gge.35 for ; Tue, 22 Jan 2013 08:21:31 -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=CF0ey4lrGhqoiQTU73xlhHAHl1aHe4BmUEjT07eFp6I=; b=qZpbrihyO+SkLX9dtSS4fJ0gd8o57GJCiiiI9qrry01YrDPLakVMwI+fmscmDkTTc6 F+9uqvMB1D7T72nP8FKuo5Y4hBd+X8ealXW9K5AZOmHwUOCUX+IeXaq9vFBFAY+YwFEg nS9TrAZ/qwehJejxIgq0RVweMn6TTLjtGRnJVy/Psoj9C5q7DL4jttxTKb0YgtyoPwnC spMMpj3eeo61bnUDkHe7zVgPSSUSSjpOFCfgq83Ngu1Q9yRUKW70Ct2wOk17SfE9LK+n K6O8xC7IoiPUOylw2HLSedXo/b6SVW6Zgh9Y+KfcwmV8KMZFWoqseIIAMAaI0mSi6nbe bqEw== X-Received: by 10.236.140.65 with SMTP id d41mr24583092yhj.113.1358871691229; Tue, 22 Jan 2013 08:21:31 -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 x41sm17057976yhg.9.2013.01.22.08.21.29 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jan 2013 08:21:30 -0800 (PST) Message-ID: <50FEBC87.2090605@gmail.com> Date: Tue, 22 Jan 2013 10:21:27 -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> <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, 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 16:21:37 -0000 On 01/22/13 09:59, Oliver Lehmann wrote: > > "Joseph A. Nagy, Jr" 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 :( Perhaps merge is the wrong term (but its what svn uses) but what it really does is overwrite the local file with the one from the repo. I've been doing that for months now with no problems. -- 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