From owner-freebsd-ports@FreeBSD.ORG Tue Jan 22 16:37:42 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 93BD0FDE for ; Tue, 22 Jan 2013 16:37:42 +0000 (UTC) (envelope-from rwmaillists@googlemail.com) Received: from mail-bk0-f47.google.com (mail-bk0-f47.google.com [209.85.214.47]) by mx1.freebsd.org (Postfix) with ESMTP id ED3E51D7 for ; Tue, 22 Jan 2013 16:37:41 +0000 (UTC) Received: by mail-bk0-f47.google.com with SMTP id jc3so579106bkc.20 for ; Tue, 22 Jan 2013 08:37:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:subject:message-id:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; bh=f7z3OBPb2LZcRLy7NfT5Lh8jf0FsZYRHVhOLDrS88to=; b=sPcVQupS9cGRB5A2wmidxZOfwbux5gfgDWI/HVCk1SXPCJgfpLmw2dOAIASUz4RM+L UBhkzqS5Pd8U8HqQoNYWwYWn7ottdoHNX9lN6yI0Pl6uynt6KA9sbN3H+EA4mJPDEg2G e1wm28Menwg0HWBcsmFvAXjZVJrFhZRyQFcOUy5ekhn30MytlZtNrrDhxOkV4cdFlcD4 4J0dAOg385ZISIZPCErt8XmsG45JkqcUYIZlLOmajEehZZVXWxZ1QH6tTsQPVUl+Xw7w 5HqWSwNV2xhTRtBMrOEsIwBFabydBBSHDzQNkAWo+8S2LjRPrnDEL1TZ7lXDbVPpPOM+ mBhQ== X-Received: by 10.204.131.89 with SMTP id w25mr1921696bks.22.1358872660431; Tue, 22 Jan 2013 08:37:40 -0800 (PST) Received: from gumby.homeunix.com (87-194-105-247.bethere.co.uk. [87.194.105.247]) by mx.google.com with ESMTPS id o9sm11714037bko.15.2013.01.22.08.37.39 (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 22 Jan 2013 08:37:39 -0800 (PST) Date: Tue, 22 Jan 2013 16:37:36 +0000 From: RW To: ports@freebsd.org Subject: Re: portsnap - overwrite local changes Message-ID: <20130122163736.590e79da@gumby.homeunix.com> In-Reply-To: <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net> 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> X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.6; amd64-portbld-freebsd8.3) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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:37:42 -0000 On Tue, 22 Jan 2013 16:59:56 +0100 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 :( Not necessarily correctly. That reverts any modifications, but it wont necessarily remove files that need to be removed and which may cause problems if left in place. This is why "portsnap extract" removes port directories before writing a clean copy. I presume you could extract a single port if you can't spare the time for a full extract.