From owner-freebsd-ports@FreeBSD.ORG Tue Jan 22 16:27:21 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 6CC3ACAD for ; Tue, 22 Jan 2013 16:27:21 +0000 (UTC) (envelope-from mad@madpilot.net) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id 1D61B138 for ; Tue, 22 Jan 2013 16:27:21 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3YrFQZ566gzFTvZ; Tue, 22 Jan 2013 17:27:18 +0100 (CET) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nmHzPZHxd_am; Tue, 22 Jan 2013 17:27:16 +0100 (CET) Received: from vwg82.hq.ignesti.it (unknown [80.74.176.55]) by winston.madpilot.net (Postfix) with ESMTPSA; Tue, 22 Jan 2013 17:27:16 +0100 (CET) Message-ID: <50FEBDE6.2020107@madpilot.net> Date: Tue, 22 Jan 2013 17:27:18 +0100 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130115 Thunderbird/17.0.2 MIME-Version: 1.0 To: "Joseph A. Nagy, Jr" 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> <50FEBC87.2090605@gmail.com> In-Reply-To: <50FEBC87.2090605@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: ports@freebsd.org, Oliver Lehmann 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:27:21 -0000 On 01/22/13 17:21, Joseph A. Nagy, Jr wrote: > 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. > No, this is not correct. It depends on the kind of conflict. If you have not conflicting changes in your local copy those will be merged. There will be a G letter besides those files in the "svn up" output. No error message. If the change is conflicting it will ask you what to do. If the file has no change in the repo but has local changes local changes will survive. If you instead always use "svn checkout" then yes, it will overwrite changes. If subversion did such a thing(destroying local changes silently) it would be a very big problem for developers. -- Guido Falsi